diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2017-03-16 15:55:18 -0400 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2017-03-23 10:09:16 +0100 |
| commit | 48bb0da050329e5111b00a12dfc154b7e78fb3a3 (patch) | |
| tree | 33389fefc8c6eabe385f64ecb461ec0b96a013d4 | |
| parent | 5182a28b5de060c51c21b36053ab205bfbbbbe31 (diff) | |
lavc: Drop deprecated way of setting audio delay on encode
Deprecated in 08/2014.
| -rw-r--r-- | libavcodec/encode.c | 4 | ||||
| -rw-r--r-- | libavcodec/utils.c | 5 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 0 insertions, 12 deletions
diff --git a/libavcodec/encode.c b/libavcodec/encode.c index fc27a070e1..9bb7ae5bde 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -194,10 +194,6 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx, end: av_frame_free(&padded_frame); -#if FF_API_AUDIOENC_DELAY - avctx->delay = avctx->initial_padding; -#endif - return ret; } diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 61bb09b031..a6408cecbb 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -646,11 +646,6 @@ FF_ENABLE_DEPRECATION_WARNINGS } } -#if FF_API_AUDIOENC_DELAY - if (av_codec_is_encoder(avctx->codec)) - avctx->delay = avctx->initial_padding; -#endif - if (av_codec_is_decoder(avctx->codec)) { /* validate channel layout from the decoder */ if (avctx->channel_layout) { diff --git a/libavcodec/version.h b/libavcodec/version.h index 45c2dbd560..b60e9715aa 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -47,9 +47,6 @@ * the public API and may change, break or disappear at any time. */ -#ifndef FF_API_AUDIOENC_DELAY -#define FF_API_AUDIOENC_DELAY (LIBAVCODEC_VERSION_MAJOR < 58) -#endif #ifndef FF_API_AVCTX_TIMEBASE #define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 58) #endif |