aboutsummaryrefslogtreecommitdiff
path: root/libavcodec/8svx.c
diff options
context:
space:
mode:
Diffstat (limited to 'libavcodec/8svx.c')
-rw-r--r--libavcodec/8svx.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/libavcodec/8svx.c b/libavcodec/8svx.c
index 4bbbeb139f..d33f73e039 100644
--- a/libavcodec/8svx.c
+++ b/libavcodec/8svx.c
@@ -44,7 +44,6 @@
/** decoder context */
typedef struct EightSvxContext {
- AVFrame frame;
uint8_t fib_acc[2];
const int8_t *table;
@@ -88,6 +87,7 @@ static int eightsvx_decode_frame(AVCodecContext *avctx, void *data,
int *got_frame_ptr, AVPacket *avpkt)
{
EightSvxContext *esc = avctx->priv_data;
+ AVFrame *frame = data;
int buf_size;
int ch, ret;
int hdr_size = 2;
@@ -135,21 +135,20 @@ static int eightsvx_decode_frame(AVCodecContext *avctx, void *data,
}
/* get output buffer */
- esc->frame.nb_samples = buf_size * 2;
- if ((ret = ff_get_buffer(avctx, &esc->frame)) < 0) {
+ frame->nb_samples = buf_size * 2;
+ if ((ret = ff_get_buffer(avctx, frame)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return ret;
}
for (ch = 0; ch < avctx->channels; ch++) {
- delta_decode(esc->frame.data[ch], &esc->data[ch][esc->data_idx],
+ delta_decode(frame->data[ch], &esc->data[ch][esc->data_idx],
buf_size, &esc->fib_acc[ch], esc->table);
}
esc->data_idx += buf_size;
- *got_frame_ptr = 1;
- *(AVFrame *)data = esc->frame;
+ *got_frame_ptr = 1;
return ((avctx->frame_number == 0)*hdr_size + buf_size)*avctx->channels;
}
@@ -172,9 +171,6 @@ static av_cold int eightsvx_decode_init(AVCodecContext *avctx)
}
avctx->sample_fmt = AV_SAMPLE_FMT_U8P;
- avcodec_get_frame_defaults(&esc->frame);
- avctx->coded_frame = &esc->frame;
-
return 0;
}