[FFmpeg-cvslog] avconv: Drop an impossible check

Luca Barbato git at videolan.org
Tue Jan 19 08:42:43 CET 2016


ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Sat Jan  2 14:43:13 2016 +0100| [63f7f8d1dbf6ce27440fdd56ef38c822fb11b9c2] | committer: Luca Barbato

avconv: Drop an impossible check

EAGAIN is already managed in poll_filters().

Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=63f7f8d1dbf6ce27440fdd56ef38c822fb11b9c2
---

 avconv.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/avconv.c b/avconv.c
index 0410378..6b37d6e 100644
--- a/avconv.c
+++ b/avconv.c
@@ -1231,7 +1231,7 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output)
                decoded_frame->width, decoded_frame->height, av_get_pix_fmt_name(decoded_frame->format));
 
         ret = poll_filters();
-        if (ret < 0 && (ret != AVERROR_EOF && ret != AVERROR(EAGAIN))) {
+        if (ret < 0 && ret != AVERROR_EOF) {
             char errbuf[128];
             av_strerror(ret, errbuf, sizeof(errbuf));
 
@@ -2556,7 +2556,7 @@ static int transcode(void)
         }
 
         ret = poll_filters();
-        if (ret < 0 && (ret != AVERROR_EOF || ret != AVERROR(EAGAIN))) {
+        if (ret < 0 && ret != AVERROR_EOF) {
             char errbuf[128];
             av_strerror(ret, errbuf, sizeof(errbuf));
 



More information about the ffmpeg-cvslog mailing list