summaryrefslogtreecommitdiff
path: root/libavcodec/aacenc.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-02-23 08:20:12 +0100
committerAnton Khirnov <anton@khirnov.net>2013-03-09 08:36:40 +0100
commitf073b1500e3b53835034b7421db0a1cf5bea05a0 (patch)
tree34c6a8ff1bc639596c56c9419afb7c83bad22034 /libavcodec/aacenc.c
parent5d606863c353553488e88dfd89ea5571268d9dca (diff)
lavc: remove disabled FF_API_OLD_ENCODE_AUDIO cruft
Diffstat (limited to 'libavcodec/aacenc.c')
-rw-r--r--libavcodec/aacenc.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c
index 5d15e85bde..60eca59ae0 100644
--- a/libavcodec/aacenc.c
+++ b/libavcodec/aacenc.c
@@ -683,9 +683,6 @@ static av_cold int aac_encode_end(AVCodecContext *avctx)
av_freep(&s->buffer.samples);
av_freep(&s->cpe);
ff_af_queue_close(&s->afq);
-#if FF_API_OLD_ENCODE_AUDIO
- av_freep(&avctx->coded_frame);
-#endif
return 0;
}
@@ -719,11 +716,6 @@ static av_cold int alloc_buffers(AVCodecContext *avctx, AACEncContext *s)
for(ch = 0; ch < s->channels; ch++)
s->planar_samples[ch] = s->buffer.samples + 3 * 1024 * ch;
-#if FF_API_OLD_ENCODE_AUDIO
- if (!(avctx->coded_frame = avcodec_alloc_frame()))
- goto alloc_fail;
-#endif
-
return 0;
alloc_fail:
return AVERROR(ENOMEM);