Imported Debian version 2.5.0~trusty1.1

[deb_ffmpeg.git] / ffmpeg / libavcodec / libfaac.c

diff --git a/ffmpeg/libavcodec/libfaac.c b/ffmpeg/libavcodec/libfaac.c
index 477669a81239c388142f4bc02d07c467d3e560bf..69c186b11a7f3a8f451f3afac95fe20d80fb4513 100644 (file)
--- a/ffmpeg/libavcodec/libfaac.c
+++ b/ffmpeg/libavcodec/libfaac.c
@@ -167,7 +167,7 @@ static av_cold int Faac_encode_init(AVCodecContext *avctx)
         }
     }
 
-    avctx->delay = FAAC_DELAY_SAMPLES;
+    avctx->initial_padding = FAAC_DELAY_SAMPLES;
     ff_af_queue_init(avctx, &s->afq);
 
     return 0;