diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 01:04:16 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 01:04:16 +0400 |
commit | e052f06531c400a845092a7e425ef97834260b3b (patch) | |
tree | 85324d9b7c63a360d5a02e8d2018d1a176db1452 /libavcodec/libfdk-aacenc.c | |
parent | eba6a04e1c9c802186f14b93671dd3137ae6bea8 (diff) | |
parent | 0f24a3ca999a702f83af9307f9f47b6fdeb546a5 (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/libfdk-aacenc.c')
-rw-r--r-- | libavcodec/libfdk-aacenc.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c index e4710f6c56..e3992e1dbe 100644 --- a/libavcodec/libfdk-aacenc.c +++ b/libavcodec/libfdk-aacenc.c @@ -97,9 +97,6 @@ static int aac_encode_close(AVCodecContext *avctx) if (s->handle) aacEncClose(&s->handle); -#if FF_API_OLD_ENCODE_AUDIO - av_freep(&avctx->coded_frame); -#endif av_freep(&avctx->extradata); ff_af_queue_close(&s->afq); @@ -275,13 +272,6 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) goto error; } -#if FF_API_OLD_ENCODE_AUDIO - avctx->coded_frame = avcodec_alloc_frame(); - if (!avctx->coded_frame) { - ret = AVERROR(ENOMEM); - goto error; - } -#endif avctx->frame_size = info.frameLength; avctx->delay = info.encoderDelay; ff_af_queue_init(avctx, &s->afq); |