Merge commit '63f7f8d1dbf6ce27440fdd56ef38c822fb11b9c2'

* commit '63f7f8d1dbf6ce27440fdd56ef38c822fb11b9c2': avconv: Drop an impossible check Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago · 7dae3461c0
parent 4440c8e9c9 63f7f8d1db
commit 7dae3461c0
1 changed files with 1 additions and 1 deletions
--- a/ffmpeg.c
+++ b/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));