Commit 09100ccc authored by James Almer's avatar James Almer

Merge commit 'a58873b1'

* commit 'a58873b1':
  avconv: when using -loop option bail out if seek to start fails
Merged-by: 's avatarJames Almer <jamrial@gmail.com>
parents fd352fad a58873b1
...@@ -4198,9 +4198,11 @@ static int process_input(int file_index) ...@@ -4198,9 +4198,11 @@ static int process_input(int file_index)
return ret; return ret;
} }
if (ret < 0 && ifile->loop) { if (ret < 0 && ifile->loop) {
if ((ret = seek_to_start(ifile, is)) < 0) ret = seek_to_start(ifile, is);
return ret; if (ret < 0)
ret = get_input_packet(ifile, &pkt); av_log(NULL, AV_LOG_WARNING, "Seek to start failed.\n");
else
ret = get_input_packet(ifile, &pkt);
if (ret == AVERROR(EAGAIN)) { if (ret == AVERROR(EAGAIN)) {
ifile->eagain = 1; ifile->eagain = 1;
return ret; return ret;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment