diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2009-01-22 12:04:01 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2009-01-22 12:04:01 +0000 |
commit | ad51c68c011526d856dc02b53fb5f3708efb677c (patch) | |
tree | c7886ae7a75847248bd26cd92c6bc0877fd3ff63 /ffmpeg.c | |
parent | 4d6f600c58093d64fab0f47f8c52af0f0404ffb8 (diff) | |
download | ffmpeg-ad51c68c011526d856dc02b53fb5f3708efb677c.tar.gz |
Handle av_read_frame() EAGAIN return.
Originally committed as revision 16717 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -2100,7 +2100,10 @@ static int av_encode(AVFormatContext **output_files, /* read a frame from it and output it in the fifo */ is = input_files[file_index]; - if (av_read_frame(is, &pkt) < 0) { + ret= av_read_frame(is, &pkt); + if(ret == AVERROR(EAGAIN)) + continue; + if (ret < 0) { file_table[file_index].eof_reached = 1; if (opt_shortest) break; |