virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avconv: Drop an impossible check

Browse Source 
EAGAIN is already managed in poll_filters().

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
Luca Barbato
2016-01-02 14:43:13 +01:00
parent 7ebf1b4ada
commit 63f7f8d1db
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
avconv.c
View File

@@ -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)); decoded_frame->width, decoded_frame->height, av_get_pix_fmt_name(decoded_frame->format));
ret = poll_filters(); ret = poll_filters();
if (ret < 0 && (ret != AVERROR_EOF && ret != AVERROR(EAGAIN))) { if (ret < 0 && ret != AVERROR_EOF) {
char errbuf[128]; char errbuf[128];
av_strerror(ret, errbuf, sizeof(errbuf)); av_strerror(ret, errbuf, sizeof(errbuf));
@@ -2556,7 +2556,7 @@ static int transcode(void)
} }
ret = poll_filters(); ret = poll_filters();
if (ret < 0 && (ret != AVERROR_EOF || ret != AVERROR(EAGAIN))) { if (ret < 0 && ret != AVERROR_EOF) {
char errbuf[128]; char errbuf[128];
av_strerror(ret, errbuf, sizeof(errbuf)); av_strerror(ret, errbuf, sizeof(errbuf));