diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-12-23 19:39:44 -0500 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2013-02-12 12:21:23 -0500 |
| commit | 0fe4056f953ab2a6430d72e74246eb391dcf6db9 (patch) | |
| tree | b3712fc9b198b79ae1c57375e7db52b29faad644 /libavcodec | |
| parent | 3a23752c5a065ce34dc56491836e1db1fc3b88ae (diff) | |
| download | ffmpeg-0fe4056f953ab2a6430d72e74246eb391dcf6db9.tar.gz | |
nellymoser: decode directly to the user-provided AVFrame
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/nellymoserdec.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c index 08cc4ab15b..e427b23a07 100644 --- a/libavcodec/nellymoserdec.c +++ b/libavcodec/nellymoserdec.c @@ -49,7 +49,6 @@ typedef struct NellyMoserDecodeContext { AVCodecContext* avctx; - AVFrame frame; AVLFG random_state; GetBitContext gb; float scale_bias; @@ -136,15 +135,13 @@ static av_cold int decode_init(AVCodecContext * avctx) { avctx->channels = 1; avctx->channel_layout = AV_CH_LAYOUT_MONO; - avcodec_get_frame_defaults(&s->frame); - avctx->coded_frame = &s->frame; - return 0; } static int decode_tag(AVCodecContext *avctx, void *data, int *got_frame_ptr, AVPacket *avpkt) { + AVFrame *frame = data; const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; NellyMoserDecodeContext *s = avctx->priv_data; @@ -169,12 +166,12 @@ static int decode_tag(AVCodecContext *avctx, void *data, */ /* get output buffer */ - s->frame.nb_samples = NELLY_SAMPLES * blocks; - if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) { + frame->nb_samples = NELLY_SAMPLES * blocks; + if ((ret = ff_get_buffer(avctx, frame)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; } - samples_flt = (float *)s->frame.data[0]; + samples_flt = (float *)frame->data[0]; for (i=0 ; i<blocks ; i++) { nelly_decode_block(s, buf, samples_flt); @@ -182,8 +179,7 @@ static int decode_tag(AVCodecContext *avctx, void *data, buf += NELLY_BLOCK_LEN; } - *got_frame_ptr = 1; - *(AVFrame *)data = s->frame; + *got_frame_ptr = 1; return buf_size; } |