diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2009-01-23 09:47:22 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2009-01-23 09:47:22 +0000 |
commit | 2d4eeaadc41a0adf97d6b71677d014833df432e2 (patch) | |
tree | 47908596d59b43caaed3052bdf95145941ce5424 | |
parent | 1cae2ef9a6730863b1d68e27fa3de13afd3a0ea6 (diff) | |
download | ffmpeg-2d4eeaadc41a0adf97d6b71677d014833df432e2.tar.gz |
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
-rw-r--r-- | ffmpeg.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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; |