generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '7ebf1b4adad40e2b0d88ebd5cfde821a7a0ceab2'

Browse Source 
* commit '7ebf1b4adad40e2b0d88ebd5cfde821a7a0ceab2':
  avconv: Simplify poll_filters() return value check

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2016-01-19 08:40:32 +01:00
commit 4440c8e9c9
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ffmpeg.c
View File

@ -4126,16 +4126,12 @@ static int transcode(void)
} }
ret = transcode_step(); ret = transcode_step();
if (ret < 0) { if (ret < 0 && (ret != AVERROR_EOF && ret != AVERROR(EAGAIN))) {
if (ret == AVERROR_EOF || ret == AVERROR(EAGAIN)) { char errbuf[128];
continue; av_strerror(ret, errbuf, sizeof(errbuf));
} else {
char errbuf[128];
av_strerror(ret, errbuf, sizeof(errbuf));
av_log(NULL, AV_LOG_ERROR, "Error while filtering: %s\n", errbuf); av_log(NULL, AV_LOG_ERROR, "Error while filtering: %s\n", errbuf);
break; break;
}
} }
/* dump report by using the output first video and audio streams */ /* dump report by using the output first video and audio streams */