aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2016-01-02 14:43:12 +0100
committerLuca Barbato <lu_zero@gentoo.org>2016-01-04 16:58:32 +0100
commit7ebf1b4adad40e2b0d88ebd5cfde821a7a0ceab2 (patch)
tree62d30eb39d9766048c30e0024ad85d7592413ceb
parent2080bea4a74b6b1598caa806a11ea807ba546f94 (diff)
downloadffmpeg-7ebf1b4adad40e2b0d88ebd5cfde821a7a0ceab2.tar.gz
avconv: Simplify poll_filters() return value check
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
-rw-r--r--avconv.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/avconv.c b/avconv.c
index 57a371835d..0410378487 100644
--- a/avconv.c
+++ b/avconv.c
@@ -2556,16 +2556,12 @@ static int transcode(void)
}
ret = poll_filters();
- 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 */