[FFmpeg-cvslog] avconv: propagate fatal errors from lavfi.

Anton Khirnov git at videolan.org
Mon Jul 9 22:43:09 CEST 2012


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Tue Jul  3 11:44:46 2012 +0200| [8a645bfc31fa0c05d08e5b5a453c232c56711092] | committer: Anton Khirnov

avconv: propagate fatal errors from lavfi.

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

 avconv.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/avconv.c b/avconv.c
index fad0626..9df5bb3 100644
--- a/avconv.c
+++ b/avconv.c
@@ -1556,8 +1556,10 @@ static int poll_filters(void)
             else
                 ret = av_buffersink_read(ost->filter->filter, &picref);
 
-            if (ret < 0)
+            if (ret == AVERROR_EOF || ret == AVERROR(EAGAIN))
                 break;
+            else if (ret < 0)
+                return ret;
 
             avfilter_copy_buf_props(filtered_frame, picref);
             if (picref->pts != AV_NOPTS_VALUE) {



More information about the ffmpeg-cvslog mailing list