[FFmpeg-cvslog] ffmpeg: Fix stream copy with initial_padding

Michael Niedermayer git at videolan.org
Tue Oct 14 03:41:38 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Oct 14 03:30:03 2014 +0200| [83f84e4c53e4a0542586aa7c3e9d3048dc4d2277] | committer: Michael Niedermayer

ffmpeg: Fix stream copy with initial_padding

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=83f84e4c53e4a0542586aa7c3e9d3048dc4d2277
---

 ffmpeg.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/ffmpeg.c b/ffmpeg.c
index 440bd26..60f6b1d 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2637,7 +2637,10 @@ static int transcode_init(void)
                 enc_ctx->frame_size         = dec_ctx->frame_size;
                 enc_ctx->audio_service_type = dec_ctx->audio_service_type;
                 enc_ctx->block_align        = dec_ctx->block_align;
+                enc_ctx->initial_padding    = dec_ctx->delay;
+#if FF_API_AUDIOENC_DELAY
                 enc_ctx->delay              = dec_ctx->delay;
+#endif
                 if((enc_ctx->block_align == 1 || enc_ctx->block_align == 1152 || enc_ctx->block_align == 576) && enc_ctx->codec_id == AV_CODEC_ID_MP3)
                     enc_ctx->block_align= 0;
                 if(enc_ctx->codec_id == AV_CODEC_ID_AC3)



More information about the ffmpeg-cvslog mailing list