summaryrefslogtreecommitdiff
path: root/libavcodec/libilbc.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/libilbc.c
parent5d606863c353553488e88dfd89ea5571268d9dca (diff)
downloadffmpeg-f073b1500e3b53835034b7421db0a1cf5bea05a0.tar.gz
lavc: remove disabled FF_API_OLD_ENCODE_AUDIO cruft
Diffstat (limited to 'libavcodec/libilbc.c')
-rw-r--r--libavcodec/libilbc.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/libavcodec/libilbc.c b/libavcodec/libilbc.c
index d47227cada..714fdb0210 100644
--- a/libavcodec/libilbc.c
+++ b/libavcodec/libilbc.c
@@ -153,23 +153,10 @@ static av_cold int ilbc_encode_init(AVCodecContext *avctx)
avctx->block_align = s->encoder.no_of_bytes;
avctx->frame_size = s->encoder.blockl;
-#if FF_API_OLD_ENCODE_AUDIO
- avctx->coded_frame = avcodec_alloc_frame();
- if (!avctx->coded_frame)
- return AVERROR(ENOMEM);
-#endif
return 0;
}
-static av_cold int ilbc_encode_close(AVCodecContext *avctx)
-{
-#if FF_API_OLD_ENCODE_AUDIO
- av_freep(&avctx->coded_frame);
-#endif
- return 0;
-}
-
static int ilbc_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
const AVFrame *frame, int *got_packet_ptr)
{
@@ -200,7 +187,6 @@ AVCodec ff_libilbc_encoder = {
.priv_data_size = sizeof(ILBCEncContext),
.init = ilbc_encode_init,
.encode2 = ilbc_encode_frame,
- .close = ilbc_encode_close,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_NONE },
.long_name = NULL_IF_CONFIG_SMALL("iLBC (Internet Low Bitrate Codec)"),