aboutsummaryrefslogtreecommitdiffstats
path: root/avconv.c
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2016-01-02 14:43:13 +0100
committerLuca Barbato <lu_zero@gentoo.org>2016-01-04 16:58:32 +0100
commit63f7f8d1dbf6ce27440fdd56ef38c822fb11b9c2 (patch)
tree223aa744e999cc0191702d8803be3c5b762af7d8 /avconv.c
parent7ebf1b4adad40e2b0d88ebd5cfde821a7a0ceab2 (diff)
downloadffmpeg-63f7f8d1dbf6ce27440fdd56ef38c822fb11b9c2.tar.gz
avconv: Drop an impossible check
EAGAIN is already managed in poll_filters(). Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'avconv.c')
-rw-r--r--avconv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/avconv.c b/avconv.c
index 0410378487..6b37d6e7d6 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));