diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 22:04:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 22:04:16 +0100 |
| commit | e052f06531c400a845092a7e425ef97834260b3b (patch) | |
| tree | 85324d9b7c63a360d5a02e8d2018d1a176db1452 /libavcodec/mpegaudioenc.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/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 36345137f2..3a109f09dc 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; } @@ -769,14 +763,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 }, @@ -789,7 +775,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[]){ |