aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2016-01-19 08:40:32 +0100
committerHendrik Leppkes <h.leppkes@gmail.com>2016-01-19 08:40:32 +0100
commit4440c8e9c98f138a04dafdec8f3d21ce8f07f7b9 (patch)
treea4b2f58df9fd319fe2698d1718723f11572b14c3
parentc1a3683f26fb49ae700f0c202ab395cbcbd927a5 (diff)
parent7ebf1b4adad40e2b0d88ebd5cfde821a7a0ceab2 (diff)
downloadffmpeg-4440c8e9c98f138a04dafdec8f3d21ce8f07f7b9.tar.gz
Merge commit '7ebf1b4adad40e2b0d88ebd5cfde821a7a0ceab2'
* commit '7ebf1b4adad40e2b0d88ebd5cfde821a7a0ceab2': avconv: Simplify poll_filters() return value check Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
-rw-r--r--ffmpeg.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 1f4277c4c2..5d014128ad 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -4126,16 +4126,12 @@ static int transcode(void)
}
ret = transcode_step();
- if (ret < 0) {
- if (ret == AVERROR_EOF || ret == AVERROR(EAGAIN)) {
- continue;
- } else {
- char errbuf[128];
- av_strerror(ret, errbuf, sizeof(errbuf));
+ if (ret < 0 && (ret != AVERROR_EOF && ret != AVERROR(EAGAIN))) {
+ char errbuf[128];
+ av_strerror(ret, errbuf, sizeof(errbuf));
- av_log(NULL, AV_LOG_ERROR, "Error while filtering: %s\n", errbuf);
- break;
- }
+ av_log(NULL, AV_LOG_ERROR, "Error while filtering: %s\n", errbuf);
+ break;
}
/* dump report by using the output first video and audio streams */