Merge commit '26d9b60373bf45bc4f91ff6815f5fa36764d4d7b'

[ffmpeg] / libavcodec / encode.c

diff --git a/libavcodec/encode.c b/libavcodec/encode.c
index c961dbace10b594be133ebf9b6ecb5b152f13ad8..71b1b14afc029dfb5ea61afc22a668bbc0b02e46 100644 (file)
--- a/libavcodec/encode.c
+++ b/libavcodec/encode.c
@@ -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;
 }