projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1cae2ef
)
Workaround ffms behavior of returning EAGAIN at EOF.
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 23 Jan 2009 09:47:22 +0000
(09:47 +0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 23 Jan 2009 09:47:22 +0000
(09:47 +0000)
Should fix regression tests & fate.
Originally committed as revision 16727 to svn://svn.ffmpeg.org/ffmpeg/trunk
ffmpeg.c
patch
|
blob
|
history
diff --git
a/ffmpeg.c
b/ffmpeg.c
index
48dafba
..
03f9109
100644
(file)
--- a/
ffmpeg.c
+++ b/
ffmpeg.c
@@
-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;