Commit 48bb0da0 authored by Vittorio Giovara's avatar Vittorio Giovara

lavc: Drop deprecated way of setting audio delay on encode

Deprecated in 08/2014.
parent 5182a28b
...@@ -194,10 +194,6 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx, ...@@ -194,10 +194,6 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx,
end: end:
av_frame_free(&padded_frame); av_frame_free(&padded_frame);
#if FF_API_AUDIOENC_DELAY
avctx->delay = avctx->initial_padding;
#endif
return ret; return ret;
} }
......
...@@ -646,11 +646,6 @@ FF_ENABLE_DEPRECATION_WARNINGS ...@@ -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)) { if (av_codec_is_decoder(avctx->codec)) {
/* validate channel layout from the decoder */ /* validate channel layout from the decoder */
if (avctx->channel_layout) { if (avctx->channel_layout) {
......
...@@ -47,9 +47,6 @@ ...@@ -47,9 +47,6 @@
* the public API and may change, break or disappear at any time. * 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 #ifndef FF_API_AVCTX_TIMEBASE
#define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 58) #define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 58)
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment