eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-24 16:00:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Originally committed as revision 17737 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5
This commit is contained in:
Baptiste Coudurier
2009-03-02 20:32:24 +00:00
parent da835cc8a3
commit 07679e680c
3 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ffmpeg.c
View File

@@ -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;