summaryrefslogtreecommitdiff
path: root/libavcodec/wma.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-12 22:04:16 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-12 22:04:16 +0100
commite052f06531c400a845092a7e425ef97834260b3b (patch)
tree85324d9b7c63a360d5a02e8d2018d1a176db1452 /libavcodec/wma.c
parenteba6a04e1c9c802186f14b93671dd3137ae6bea8 (diff)
parent0f24a3ca999a702f83af9307f9f47b6fdeb546a5 (diff)
downloadffmpeg-e052f06531c400a845092a7e425ef97834260b3b.tar.gz
Merge commit '0f24a3ca999a702f83af9307f9f47b6fdeb546a5'
* commit '0f24a3ca999a702f83af9307f9f47b6fdeb546a5': lavc: remove disabled FF_API_OLD_ENCODE_VIDEO cruft lavc: remove disabled FF_API_OLD_ENCODE_AUDIO cruft lavc: remove disabled FF_API_OLD_DECODE_AUDIO cruft Conflicts: libavcodec/flacenc.c libavcodec/libgsm.c libavcodec/utils.c libavcodec/version.h The compatibility wrapers are left as they likely sre still in wide use. They will be removed when they break or otherwise cause work without an volunteer being available. Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wma.c')
-rw-r--r--libavcodec/wma.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/wma.c b/libavcodec/wma.c
index e704223f1e..1e6ca61047 100644
--- a/libavcodec/wma.c
+++ b/libavcodec/wma.c
@@ -390,11 +390,6 @@ 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;
}