Merge commit '7ebf1b4a'

* commit '7ebf1b4a':
  avconv: Simplify poll_filters() return value check
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

ffmpeg.c

@@ -4126,17 +4126,13 @@ static int transcode(void)
         }
 
         ret = transcode_step();
-        if (ret < 0) {
-            if (ret == AVERROR_EOF || ret == AVERROR(EAGAIN)) {
-                continue;
-            } else {
+        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;
         }
-        }
 
         /* dump report by using the output first video and audio streams */
         print_report(0, timer_start, cur_time);