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/vorbisenc.c | |
| parent | eba6a04e1c9c802186f14b93671dd3137ae6bea8 (diff) | |
| parent | 0f24a3ca999a702f83af9307f9f47b6fdeb546a5 (diff) | |
| download | ffmpeg-e052f06531c400a845092a7e425ef97834260b3b.tar.gz | |
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/vorbisenc.c')
| -rw-r--r-- | libavcodec/vorbisenc.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c index b8752d6bea..d685996277 100644 --- a/libavcodec/vorbisenc.c +++ b/libavcodec/vorbisenc.c @@ -1153,9 +1153,6 @@ static av_cold int vorbis_encode_close(AVCodecContext *avctx) ff_mdct_end(&venc->mdct[0]); ff_mdct_end(&venc->mdct[1]); -#if FF_API_OLD_ENCODE_AUDIO - av_freep(&avctx->coded_frame); -#endif av_freep(&avctx->extradata); return 0 ; @@ -1187,14 +1184,6 @@ static av_cold int vorbis_encode_init(AVCodecContext *avctx) avctx->frame_size = 1 << (venc->log2_blocksize[0] - 1); -#if FF_API_OLD_ENCODE_AUDIO - avctx->coded_frame = avcodec_alloc_frame(); - if (!avctx->coded_frame) { - ret = AVERROR(ENOMEM); - goto error; - } -#endif - return 0; error: vorbis_encode_close(avctx); |