diff options
| author | Peter Große <pegro@friiks.de> | 2017-06-30 17:28:53 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2017-07-28 13:13:44 +0200 |
| commit | a58873b11198d04670b7f98f5a8a749d742db7c5 (patch) | |
| tree | a204349202efaed577cd2fb2331ce7a5cf14b716 | |
| parent | 004ea63714e31ed43326ad00d7420d104f0dab38 (diff) | |
| download | ffmpeg-a58873b11198d04670b7f98f5a8a749d742db7c5.tar.gz | |
avconv: when using -loop option bail out if seek to start fails
Fixes an infinite loop when a demuxer fails to seek to the start of the input.
Signed-off-by: Peter Große <pegro@friiks.de>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -rw-r--r-- | avtools/avconv.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/avtools/avconv.c b/avtools/avconv.c index 8dd11bb5fc..4e3ffecdef 100644 --- a/avtools/avconv.c +++ b/avtools/avconv.c @@ -2615,9 +2615,11 @@ static int process_input(void) 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 < 0) { if (ret != AVERROR_EOF) { |