summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-14 03:30:03 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-14 03:30:03 +0200
commit83f84e4c53e4a0542586aa7c3e9d3048dc4d2277 (patch)
tree5e10a9634da568e2e138ca90e61dc8b54811a739 /ffmpeg.c
parent4694c0bb7c5ac3a9b87ab9682e2cc076b00a82f7 (diff)
downloadffmpeg-83f84e4c53e4a0542586aa7c3e9d3048dc4d2277.tar.gz
ffmpeg: Fix stream copy with initial_padding
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 440bd26a9f..60f6b1d802 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)