diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-12-23 20:25:52 -0500 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2013-02-12 12:22:40 -0500 |
| commit | c815ca36412e54e641dd0a91bc54f43f4d9d5621 (patch) | |
| tree | cf826ad2c00e7f7efed51912daa173c719cc431e | |
| parent | f4a283eec49b116fa07498bb71249e0620ec0fff (diff) | |
| download | ffmpeg-c815ca36412e54e641dd0a91bc54f43f4d9d5621.tar.gz | |
wma: decode directly to the user-provided AVFrame
| -rw-r--r-- | libavcodec/wmadec.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/libavcodec/wmadec.c b/libavcodec/wmadec.c index 4edf92f5c1..6fbef08920 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -110,9 +110,6 @@ static int wma_decode_init(AVCodecContext * avctx) avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; - avcodec_get_frame_defaults(&s->frame); - avctx->coded_frame = &s->frame; - return 0; } @@ -788,6 +785,7 @@ static int wma_decode_frame(WMACodecContext *s, float **samples, static int wma_decode_superframe(AVCodecContext *avctx, void *data, int *got_frame_ptr, AVPacket *avpkt) { + AVFrame *frame = data; const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; WMACodecContext *s = avctx->priv_data; @@ -821,12 +819,12 @@ static int wma_decode_superframe(AVCodecContext *avctx, void *data, } /* get output buffer */ - s->frame.nb_samples = nb_frames * s->frame_len; - if ((ret = ff_get_buffer(avctx, &s->frame)) < 0) { + frame->nb_samples = nb_frames * s->frame_len; + if ((ret = ff_get_buffer(avctx, frame)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; } - samples = (float **)s->frame.extended_data; + samples = (float **)frame->extended_data; samples_offset = 0; if (s->use_bit_reservoir) { @@ -905,8 +903,7 @@ static int wma_decode_superframe(AVCodecContext *avctx, void *data, s->frame_len_bits, s->block_len_bits, s->frame_len, s->block_len, (int8_t *)samples - (int8_t *)data, avctx->block_align); - *got_frame_ptr = 1; - *(AVFrame *)data = s->frame; + *got_frame_ptr = 1; return avctx->block_align; fail: |