Browse Source

lavc: Drop deprecated way of setting audio delay on encode

Deprecated in 08/2014.
tags/n4.0
Vittorio Giovara 9 years ago
parent
commit
48bb0da050
3 changed files with 0 additions and 12 deletions
  1. +0
    -4
      libavcodec/encode.c
  2. +0
    -5
      libavcodec/utils.c
  3. +0
    -3
      libavcodec/version.h

+ 0
- 4
libavcodec/encode.c View File

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




+ 0
- 5
libavcodec/utils.c View File

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


+ 0
- 3
libavcodec/version.h View File

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


Loading…
Cancel
Save