diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-02-23 08:20:12 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-03-09 08:36:40 +0100 |
| commit | f073b1500e3b53835034b7421db0a1cf5bea05a0 (patch) | |
| tree | 34c6a8ff1bc639596c56c9419afb7c83bad22034 /libavcodec/g726.c | |
| parent | 5d606863c353553488e88dfd89ea5571268d9dca (diff) | |
| download | ffmpeg-f073b1500e3b53835034b7421db0a1cf5bea05a0.tar.gz | |
lavc: remove disabled FF_API_OLD_ENCODE_AUDIO cruft
Diffstat (limited to 'libavcodec/g726.c')
| -rw-r--r-- | libavcodec/g726.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/libavcodec/g726.c b/libavcodec/g726.c index e1448a1487..6db00feb31 100644 --- a/libavcodec/g726.c +++ b/libavcodec/g726.c @@ -331,13 +331,6 @@ static av_cold int g726_encode_init(AVCodecContext *avctx) g726_reset(c); -#if FF_API_OLD_ENCODE_AUDIO - avctx->coded_frame = avcodec_alloc_frame(); - if (!avctx->coded_frame) - return AVERROR(ENOMEM); - avctx->coded_frame->key_frame = 1; -#endif - /* select a frame size that will end on a byte boundary and have a size of approximately 1024 bytes */ avctx->frame_size = ((int[]){ 4096, 2736, 2048, 1640 })[c->code_size - 2]; @@ -345,14 +338,6 @@ static av_cold int g726_encode_init(AVCodecContext *avctx) return 0; } -#if FF_API_OLD_ENCODE_AUDIO -static av_cold int g726_encode_close(AVCodecContext *avctx) -{ - av_freep(&avctx->coded_frame); - return 0; -} -#endif - static int g726_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, const AVFrame *frame, int *got_packet_ptr) { @@ -404,9 +389,6 @@ AVCodec ff_adpcm_g726_encoder = { .priv_data_size = sizeof(G726Context), .init = g726_encode_init, .encode2 = g726_encode_frame, -#if FF_API_OLD_ENCODE_AUDIO - .close = g726_encode_close, -#endif .capabilities = CODEC_CAP_SMALL_LAST_FRAME, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, |