Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-13 01:04:16 +0400
committerMichael Niedermayer <michaelni@gmx.at>2013-03-13 01:04:16 +0400
commite052f06531c400a845092a7e425ef97834260b3b (patch)
tree85324d9b7c63a360d5a02e8d2018d1a176db1452 /libavcodec/wmaenc.c
parenteba6a04e1c9c802186f14b93671dd3137ae6bea8 (diff)
parent0f24a3ca999a702f83af9307f9f47b6fdeb546a5 (diff)
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/wmaenc.c')
-rw-r--r--libavcodec/wmaenc.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c
index e15109519b..799535ea70 100644
--- a/libavcodec/wmaenc.c
+++ b/libavcodec/wmaenc.c
@@ -50,11 +50,6 @@ static int encode_init(AVCodecContext * avctx){
return AVERROR(EINVAL);
}
-#if FF_API_OLD_ENCODE_AUDIO
- if (!(avctx->coded_frame = avcodec_alloc_frame()))
- return AVERROR(ENOMEM);
-#endif
-
/* extract flag infos */
flags1 = 0;
flags2 = 1;