aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg_opt.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-11-14 01:21:20 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-11-16 14:27:29 +0100
commitd7ebeba80c609e160a171168b3434c342a652237 (patch)
tree1807e0aebc5b53f1c167058a82fcf990f9565fea /ffmpeg_opt.c
parentd04b7de786780747878c080ba522405c6f542ccb (diff)
downloadffmpeg-d7ebeba80c609e160a171168b3434c342a652237.tar.gz
ffmpeg: Do not fill gap before the first decodable frame on single stream input files unless the user explicitly requests it.
Fixes different behavior to JM and probably several if not all reference decoders. We cannot just do this unconditionally as it would ruin AV sync in some use cases. Bug-Found-by: BugMaster Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
-rw-r--r--ffmpeg_opt.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index 23e1c40397..8da1ce43a6 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -852,6 +852,7 @@ static int open_input_file(OptionsContext *o, const char *filename)
f->ist_index = nb_input_streams - ic->nb_streams;
f->start_time = o->start_time;
f->recording_time = o->recording_time;
+ f->input_ts_offset = o->input_ts_offset;
f->ts_offset = o->input_ts_offset - (copy_ts ? 0 : timestamp);
f->nb_streams = ic->nb_streams;
f->rate_emu = o->rate_emu;