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/libspeexenc.c | |
| parent | 5d606863c353553488e88dfd89ea5571268d9dca (diff) | |
| download | ffmpeg-f073b1500e3b53835034b7421db0a1cf5bea05a0.tar.gz | |
lavc: remove disabled FF_API_OLD_ENCODE_AUDIO cruft
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 4277e62e4c..9469a76288 100644 --- a/libavcodec/libspeexenc.c +++ b/libavcodec/libspeexenc.c @@ -251,16 +251,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); @@ -329,9 +319,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; |