diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 01:21:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 19:11:07 +0100 |
| commit | 4b846f0ccf8094b4b14e8e3b8a06955ff48eca15 (patch) | |
| tree | 8b4bb713876612c858e11bd77754c30ee5e1fe96 /ffmpeg_opt.c | |
| parent | 425517eecbb0dd708434d409ed43b5b078719bfd (diff) | |
| download | android_external_ffmpeg-4b846f0ccf8094b4b14e8e3b8a06955ff48eca15.tar.gz android_external_ffmpeg-4b846f0ccf8094b4b14e8e3b8a06955ff48eca15.tar.bz2 android_external_ffmpeg-4b846f0ccf8094b4b14e8e3b8a06955ff48eca15.zip | |
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>
(cherry picked from commit d7ebeba80c609e160a171168b3434c342a652237)
Conflicts:
ffmpeg.c
Diffstat (limited to 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index c9283d69fa..d154807bdf 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; |