mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-01-31 03:44:15 +00:00
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
This commit is contained in:
parent
1cae2ef9a6
commit
2d4eeaadc4
2
ffmpeg.c
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…
Reference in New Issue
Block a user