Merge commit '48bb0da050329e5111b00a12dfc154b7e78fb3a3'
[ffmpeg.git] / libavcodec / encode.c
index c961dba..71b1b14 100644 (file)
@@ -257,10 +257,6 @@ end:
     av_frame_free(&padded_frame);
     av_free(extended_frame);
 
-#if FF_API_AUDIOENC_DELAY
-    avctx->delay = avctx->initial_padding;
-#endif
-
     return ret;
 }