summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--avconv.c5
-rw-r--r--doc/avconv.texi3
2 files changed, 5 insertions, 3 deletions
diff --git a/avconv.c b/avconv.c
index ed0a3dd84f..493f9d2507 100644
--- a/avconv.c
+++ b/avconv.c
@@ -2329,7 +2329,8 @@ static int seek_to_start(InputFile *ifile, AVFormatContext *is)
ifile->time_base);
}
- ifile->loop--;
+ if (ifile->loop > 0)
+ ifile->loop--;
return ret;
}
@@ -2375,7 +2376,7 @@ static int process_input(void)
ifile->eagain = 1;
return ret;
}
- if ((ret < 0) && (ifile->loop > 1)) {
+ if (ret < 0 && ifile->loop) {
if ((ret = seek_to_start(ifile, is)) < 0)
return ret;
ret = get_input_packet(ifile, &pkt);
diff --git a/doc/avconv.texi b/doc/avconv.texi
index bee20396d6..6aaf445d55 100644
--- a/doc/avconv.texi
+++ b/doc/avconv.texi
@@ -254,7 +254,8 @@ Overwrite output files without asking.
Immediately exit when output files already exist.
@item -loop @var{number} (@emph{input})
-Set number of times input stream shall be looped.
+Set number of times input stream shall be looped. Loop 0 means no loop,
+loop -1 means infinite loop.
@item -c[:@var{stream_specifier}] @var{codec} (@emph{input/output,per-stream})
@itemx -codec[:@var{stream_specifier}] @var{codec} (@emph{input/output,per-stream})