RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avconv: support infinite loop for the loop option 

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
Alexandra Hájková 2015-10-21 12:03:58 +02:00 committed by Luca Barbato
parent a9a6010637
commit cd0e08813a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
avconv.c
View File

@ -2329,7 +2329,8 @@ static int seek_to_start(InputFile *ifile, AVFormatContext *is)
ifile->time_base); ifile->time_base);
} }
ifile->loop--; if (ifile->loop > 0)
ifile->loop--;
return ret; return ret;
} }
@ -2375,7 +2376,7 @@ static int process_input(void)
ifile->eagain = 1; ifile->eagain = 1;
return ret; return ret;
} }
if ((ret < 0) && (ifile->loop > 1)) { if (ret < 0 && ifile->loop) {
if ((ret = seek_to_start(ifile, is)) < 0) if ((ret = seek_to_start(ifile, is)) < 0)
return ret; return ret;
ret = get_input_packet(ifile, &pkt); ret = get_input_packet(ifile, &pkt);

3
doc/avconv.texi
View File

@ -254,7 +254,8 @@ Overwrite output files without asking.
Immediately exit when output files already exist. Immediately exit when output files already exist.
@item -loop @var{number} (@emph{input}) @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}) @item -c[:@var{stream_specifier}] @var{codec} (@emph{input/output,per-stream})
@itemx -codec[:@var{stream_specifier}] @var{codec} (@emph{input/output,per-stream}) @itemx -codec[:@var{stream_specifier}] @var{codec} (@emph{input/output,per-stream})