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/adxenc.c | |
| parent | 5d606863c353553488e88dfd89ea5571268d9dca (diff) | |
lavc: remove disabled FF_API_OLD_ENCODE_AUDIO cruft
Diffstat (limited to 'libavcodec/adxenc.c')
| -rw-r--r-- | libavcodec/adxenc.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/libavcodec/adxenc.c b/libavcodec/adxenc.c index 7a9c06a591..47620a22dd 100644 --- a/libavcodec/adxenc.c +++ b/libavcodec/adxenc.c @@ -107,14 +107,6 @@ static int adx_encode_header(AVCodecContext *avctx, uint8_t *buf, int bufsize) return HEADER_SIZE; } -#if FF_API_OLD_ENCODE_AUDIO -static av_cold int adx_encode_close(AVCodecContext *avctx) -{ - av_freep(&avctx->coded_frame); - return 0; -} -#endif - static av_cold int adx_encode_init(AVCodecContext *avctx) { ADXContext *c = avctx->priv_data; @@ -125,11 +117,6 @@ static av_cold int adx_encode_init(AVCodecContext *avctx) } avctx->frame_size = BLOCK_SAMPLES; -#if FF_API_OLD_ENCODE_AUDIO - if (!(avctx->coded_frame = avcodec_alloc_frame())) - return AVERROR(ENOMEM); -#endif - /* the cutoff can be adjusted, but this seems to work pretty well */ c->cutoff = 500; ff_adx_calculate_coeffs(c->cutoff, avctx->sample_rate, COEFF_BITS, c->coeff); @@ -177,9 +164,6 @@ AVCodec ff_adpcm_adx_encoder = { .id = AV_CODEC_ID_ADPCM_ADX, .priv_data_size = sizeof(ADXContext), .init = adx_encode_init, -#if FF_API_OLD_ENCODE_AUDIO - .close = adx_encode_close, -#endif .encode2 = adx_encode_frame, .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, |