Merge commit '48bb0da050329e5111b00a12dfc154b7e78fb3a3'
[ffmpeg.git] / libavcodec / utils.c
index caf988e..6f6707a 100644 (file)
@@ -1008,11 +1008,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
 
     ret=0;
 
-#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 (!avctx->bit_rate)
             avctx->bit_rate = get_bit_rate(avctx);