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
pull/126/head
Michael Niedermayer 16 years ago
parent 1cae2ef9a6
commit 2d4eeaadc4
  1. 2
      ffmpeg.c

@ -2101,7 +2101,7 @@ static int av_encode(AVFormatContext **output_files,
/* read a frame from it and output it in the fifo */ /* read a frame from it and output it in the fifo */
is = input_files[file_index]; is = input_files[file_index];
ret= av_read_frame(is, &pkt); ret= av_read_frame(is, &pkt);
if(ret == AVERROR(EAGAIN)) if(ret == AVERROR(EAGAIN) && strcmp(is->iformat->name, "ffm"))
continue; continue;
if (ret < 0) { if (ret < 0) {
file_table[file_index].eof_reached = 1; file_table[file_index].eof_reached = 1;

Loading…
Cancel
Save