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/mpegaudioenc.c | |
| parent | 5d606863c353553488e88dfd89ea5571268d9dca (diff) | |
lavc: remove disabled FF_API_OLD_ENCODE_AUDIO cruft
Diffstat (limited to 'libavcodec/mpegaudioenc.c')
| -rw-r--r-- | libavcodec/mpegaudioenc.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/libavcodec/mpegaudioenc.c b/libavcodec/mpegaudioenc.c index ba0d8cfcab..76e7b88fce 100644 --- a/libavcodec/mpegaudioenc.c +++ b/libavcodec/mpegaudioenc.c @@ -184,12 +184,6 @@ static av_cold int MPA_encode_init(AVCodecContext *avctx) total_quant_bits[i] = 12 * v; } -#if FF_API_OLD_ENCODE_AUDIO - avctx->coded_frame= avcodec_alloc_frame(); - if (!avctx->coded_frame) - return AVERROR(ENOMEM); -#endif - return 0; } @@ -771,14 +765,6 @@ static int MPA_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, return 0; } -static av_cold int MPA_encode_close(AVCodecContext *avctx) -{ -#if FF_API_OLD_ENCODE_AUDIO - av_freep(&avctx->coded_frame); -#endif - return 0; -} - static const AVCodecDefault mp2_defaults[] = { { "b", "128k" }, { NULL }, @@ -791,7 +777,6 @@ AVCodec ff_mp2_encoder = { .priv_data_size = sizeof(MpegAudioContext), .init = MPA_encode_init, .encode2 = MPA_encode_frame, - .close = MPA_encode_close, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, .supported_samplerates = (const int[]){ |