diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 12:49:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-13 12:49:48 +0100 |
| commit | 0dff771f31cffffec0e16944d3890564c2da16eb (patch) | |
| tree | 6c6ab0759ebf48fd5a7a478f97fb2110b4c5ad6e /libavcodec/wmadec.c | |
| parent | dca6fb08a71b8201f0a32f9cff18e7753355733a (diff) | |
| parent | 205a95f7b5178362874bc1e65eae9866723491c1 (diff) | |
Merge commit '205a95f7b5178362874bc1e65eae9866723491c1'
* commit '205a95f7b5178362874bc1e65eae9866723491c1':
wmaenc: alloc/free coded_frame instead of keeping it in the WMACodecContext
wma: decode directly to the user-provided AVFrame
wmapro: decode directly to the user-provided AVFrame
wavpack: decode directly to the user-provided AVFrame
Conflicts:
libavcodec/wavpack.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmadec.c')
| -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 cf8331b613..df5089fb32 100644 --- a/libavcodec/wmadec.c +++ b/libavcodec/wmadec.c @@ -117,9 +117,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; } @@ -800,6 +797,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; @@ -834,12 +832,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) { @@ -918,8 +916,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 buf_size; fail: |