Merge commit '63f7f8d1'

* commit '63f7f8d1':
  avconv: Drop an impossible check
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

ffmpeg.c

@@ -4126,7 +4126,7 @@ static int transcode(void)
         }
 
         ret = transcode_step();
-        if (ret < 0 && (ret != AVERROR_EOF && ret != AVERROR(EAGAIN))) {
+        if (ret < 0 && ret != AVERROR_EOF) {
             char errbuf[128];
             av_strerror(ret, errbuf, sizeof(errbuf));