revert r16717, r16718, r16719, EAGAIN handling, this causes FFserver to hang

Originally committed as revision 17737 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5

1 files changed, 1 insertions, 4 deletions

diff --git a/ffmpeg.c b/ffmpeg.c
index 8ec1f471a1..05699bc9bb 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2102,10 +2102,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) && strcmp(is->iformat->name, "ffm"))
-            continue;
-        if (ret < 0) {
+        if (av_read_frame(is, &pkt) < 0) {
             file_table[file_index].eof_reached = 1;
             if (opt_shortest)
                 break;