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/libspeexenc.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/libspeexenc.c')
-rw-r--r-- | libavcodec/libspeexenc.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/libavcodec/libspeexenc.c b/libavcodec/libspeexenc.c index 051dce6dd0..b96ca1ba55 100644 --- a/libavcodec/libspeexenc.c +++ b/libavcodec/libspeexenc.c @@ -252,16 +252,6 @@ static av_cold int encode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_ERROR, "memory allocation error\n"); return AVERROR(ENOMEM); } -#if FF_API_OLD_ENCODE_AUDIO - avctx->coded_frame = avcodec_alloc_frame(); - if (!avctx->coded_frame) { - av_freep(&avctx->extradata); - speex_header_free(header_data); - speex_encoder_destroy(s->enc_state); - av_log(avctx, AV_LOG_ERROR, "memory allocation error\n"); - return AVERROR(ENOMEM); - } -#endif /* copy header packet to extradata */ memcpy(avctx->extradata, header_data, header_size); @@ -328,9 +318,6 @@ static av_cold int encode_close(AVCodecContext *avctx) speex_encoder_destroy(s->enc_state); ff_af_queue_close(&s->afq); -#if FF_API_OLD_ENCODE_AUDIO - av_freep(&avctx->coded_frame); -#endif av_freep(&avctx->extradata); return 0; |