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

Merge commit 'cd0e08813a0484002b5defbf557c859f123953ae' 

* commit 'cd0e08813a0484002b5defbf557c859f123953ae':
  avconv: support infinite loop for the loop option

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-10-29 14:21:41 +01:00
parent 3ec049b85d cd0e08813a
commit 9f7de99517
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/ffmpeg.texi
View File

@ -254,7 +254,8 @@ Do not overwrite output files, and exit immediately if a specified
output file already exists. output file already exists.
@item -stream_loop @var{number} (@emph{input}) @item -stream_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})

5
ffmpeg.c
View File

@ -3698,7 +3698,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;
} }
@ -3726,7 +3727,7 @@ static int process_input(int file_index)
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);