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/wma.c | |
| parent | dca6fb08a71b8201f0a32f9cff18e7753355733a (diff) | |
| parent | 205a95f7b5178362874bc1e65eae9866723491c1 (diff) | |
| download | ffmpeg-streaming-0dff771f31cffffec0e16944d3890564c2da16eb.zip ffmpeg-streaming-0dff771f31cffffec0e16944d3890564c2da16eb.tar.gz | |
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/wma.c')
| -rw-r--r-- | libavcodec/wma.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/wma.c b/libavcodec/wma.c index 1e6ca61..e704223 100644 --- a/libavcodec/wma.c +++ b/libavcodec/wma.c @@ -390,6 +390,11 @@ int ff_wma_end(AVCodecContext *avctx) av_free(s->int_table[i]); } +#if FF_API_OLD_ENCODE_AUDIO + if (av_codec_is_encoder(avctx->codec)) + av_freep(&avctx->coded_frame); +#endif + return 0; } |
