[FFmpeg-cvslog] ffmpeg: do not report EOF as an error.

Nicolas George git at videolan.org
Tue Apr 24 15:59:07 CEST 2012


ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Tue Apr 24 10:52:55 2012 +0200| [62b745a6d3411c584bbac08374d7547060440809] | committer: Nicolas George

ffmpeg: do not report EOF as an error.

Not all processing goes through filters,
so processing can continue even when
all filtergraphs have reached EOF on all sinks.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=62b745a6d3411c584bbac08374d7547060440809
---

 ffmpeg.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index d1ed3c6..069ada8 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3621,7 +3621,8 @@ static int transcode(void)
         }
 
         // fprintf(stderr,"read #%d.%d size=%d\n", ist->file_index, ist->st->index, pkt.size);
-        if (output_packet(ist, &pkt) < 0 || poll_filters() < 0) {
+        if (output_packet(ist, &pkt) < 0 ||
+            ((ret = poll_filters()) < 0 && ret != AVERROR_EOF)) {
             av_log(NULL, AV_LOG_ERROR, "Error while decoding stream #%d:%d\n",
                    ist->file_index, ist->st->index);
             if (exit_on_error)



More information about the ffmpeg-cvslog mailing list