From f60a6b5853dbf656b307d06144bb20d09a9d41cb Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Fri, 19 Aug 2011 17:52:48 +0200 Subject: [PATCH] avconv: reset input_ts_offset between files. Signed-off-by: Alex Converse --- avconv.c | 1 + doc/avconv.texi | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/avconv.c b/avconv.c index 11d77419eb..4d1c1a4494 100644 --- a/avconv.c +++ b/avconv.c @@ -3065,6 +3065,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]); diff --git a/doc/avconv.texi b/doc/avconv.texi index 37f0cbd415..0710650fea 100644 --- a/doc/avconv.texi +++ b/doc/avconv.texi @@ -144,7 +144,6 @@ slower, but more accurate. @item -itsoffset @var{offset} Set the input time offset in seconds. @code{[-]hh:mm:ss[.xxx]} syntax is also supported. -This option affects all the input files that follow it. The offset is added to the timestamps of the input files. Specifying a positive offset means that the corresponding streams are delayed by 'offset' seconds.