diff options
author | Alexandra Hájková <alexandra.khirnova@gmail.com> | 2015-10-21 12:03:58 +0200 |
---|---|---|
committer | Luca Barbato <lu_zero@gentoo.org> | 2015-10-26 19:28:24 +0100 |
commit | cd0e08813a0484002b5defbf557c859f123953ae (patch) | |
tree | 34f6328638dde00f8924febad81f9321cbe2e002 | |
parent | a9a60106370f862e191dea58e748626da6a8fe97 (diff) | |
download | ffmpeg-cd0e08813a0484002b5defbf557c859f123953ae.tar.gz |
avconv: support infinite loop for the loop option
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
-rw-r--r-- | avconv.c | 5 | ||||
-rw-r--r-- | doc/avconv.texi | 3 |
2 files changed, 5 insertions, 3 deletions
@@ -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}) |