Workaround ffms behavior of returning EAGAIN at EOF.
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 23 Jan 2009 09:47:22 +0000 (09:47 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 23 Jan 2009 09:47:22 +0000 (09:47 +0000)
Should fix regression tests & fate.

Originally committed as revision 16727 to svn://svn.ffmpeg.org/ffmpeg/trunk

ffmpeg.c

index 48dafba36b91b2fb47b68a7f95dc9b4063a2ef30..03f9109cd7c90117b08e2d9f209251e91906b237 100644 (file)
--- 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;