[FFmpeg-cvslog] r16727 - trunk/ffmpeg.c

[michael]

Author: michael
Date: Fri Jan 23 10:47:22 2009
New Revision: 16727

Log:
Workaround ffms behavior of returning EAGAIN at EOF.
Should fix regression tests & fate.

Modified:
   trunk/ffmpeg.c

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Fri Jan 23 07:33:04 2009	(r16726)
+++ trunk/ffmpeg.c	Fri Jan 23 10:47:22 2009	(r16727)
@@ -2101,7 +2101,7 @@ static int av_encode(AVFormatContext **o
         /* 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;