diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-10 20:23:43 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-10 20:24:37 -0300 |
| commit | 09100ccc14690a9d781f055642b5b880752ee636 (patch) | |
| tree | 59af17f49b4a622c35c53e28b98dd4149fb6d227 | |
| parent | fd352fadbbdf850e22c2bf87d8634cbc981976ef (diff) | |
| parent | a58873b11198d04670b7f98f5a8a749d742db7c5 (diff) | |
| download | ffmpeg-09100ccc14690a9d781f055642b5b880752ee636.tar.gz | |
Merge commit 'a58873b11198d04670b7f98f5a8a749d742db7c5'
* commit 'a58873b11198d04670b7f98f5a8a749d742db7c5':
avconv: when using -loop option bail out if seek to start fails
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | fftools/ffmpeg.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 679929cfc4..0aff1d369d 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -4198,9 +4198,11 @@ static int process_input(int file_index) return ret; } if (ret < 0 && ifile->loop) { - if ((ret = seek_to_start(ifile, is)) < 0) - return ret; - ret = get_input_packet(ifile, &pkt); + ret = seek_to_start(ifile, is); + if (ret < 0) + av_log(NULL, AV_LOG_WARNING, "Seek to start failed.\n"); + else + ret = get_input_packet(ifile, &pkt); if (ret == AVERROR(EAGAIN)) { ifile->eagain = 1; return ret; |