From 2d4eeaadc41a0adf97d6b71677d014833df432e2 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 23 Jan 2009 09:47:22 +0000 Subject: [PATCH] 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 --- ffmpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; -- 2.7.4