From 7ebf1b4adad40e2b0d88ebd5cfde821a7a0ceab2 Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Sat, 2 Jan 2016 14:43:12 +0100 Subject: [PATCH] avconv: Simplify poll_filters() return value check Signed-off-by: Luca Barbato --- avconv.c | 14 +++++--------- 1 file 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 */ -- 2.11.0