lavc: Drop deprecated way of setting audio delay on encode

Deprecated in 08/2014.
pull/272/head
Vittorio Giovara 8 years ago
parent 5182a28b5d
commit 48bb0da050
  1. 4
      libavcodec/encode.c
  2. 5
      libavcodec/utils.c
  3. 3
      libavcodec/version.h

@ -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;
}

@ -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) {

@ -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

Loading…
Cancel
Save