Merge commit '7ebf1b4adad40e2b0d88ebd5cfde821a7a0ceab2'

* commit '7ebf1b4adad40e2b0d88ebd5cfde821a7a0ceab2': avconv: Simplify poll_filters() return value check Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago · 4440c8e9c9
parent c1a3683f26 7ebf1b4ada
commit 4440c8e9c9
1 changed files with 5 additions and 9 deletions
--- 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 */