From: Michael Niedermayer Date: Fri, 23 Jan 2009 09:47:22 +0000 (+0000) Subject: Workaround ffms behavior of returning EAGAIN at EOF. X-Git-Tag: v0.5~1058 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2d4eeaadc41a0adf97d6b71677d014833df432e2;p=platform%2Fupstream%2Flibav.git Workaround ffms behavior of returning EAGAIN at EOF. Should fix regression tests & fate. Originally committed as revision 16727 to svn://svn.ffmpeg.org/ffmpeg/trunk --- diff --git a/ffmpeg.c b/ffmpeg.c index 48dafba..03f9109 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -2101,7 +2101,7 @@ static int av_encode(AVFormatContext **output_files, /* read a frame from it and output it in the fifo */ is = input_files[file_index]; ret= av_read_frame(is, &pkt); - if(ret == AVERROR(EAGAIN)) + if(ret == AVERROR(EAGAIN) && strcmp(is->iformat->name, "ffm")) continue; if (ret < 0) { file_table[file_index].eof_reached = 1;