aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-08-30 16:01:20 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-08-30 18:08:23 +0200
commite5362cecfbbe221b1695361e9c64b180e08f1667 (patch)
tree59cee7ccdb050f08f552807a2325e237208210c1 /ffmpeg.c
parent3806494549d027254b85dd78bd732e64ad269b5c (diff)
downloadffmpeg-e5362cecfbbe221b1695361e9c64b180e08f1667.tar.gz
ffmpeg: reset input_ts_offset between files.
Signed-off-by: Alex Converse <alex.converse@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index e3dfdeaf6f..bca1de9389 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3242,6 +3242,7 @@ static int opt_input_file(const char *opt, const char *filename)
audio_channels = 0;
audio_sample_fmt = AV_SAMPLE_FMT_NONE;
av_dict_free(&ts_scale);
+ input_ts_offset = 0;
for (i = 0; i < orig_nb_streams; i++)
av_dict_free(&opts[i]);