aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-07-03 11:44:46 +0200
committerAnton Khirnov <anton@khirnov.net>2012-07-09 08:32:49 +0200
commit8a645bfc31fa0c05d08e5b5a453c232c56711092 (patch)
tree54a53ad79d818db847c6aca79b1d3f0d30af5bed
parentcd99146253cf9de5dad5694b97027d5612fdc61d (diff)
downloadffmpeg-8a645bfc31fa0c05d08e5b5a453c232c56711092.tar.gz
avconv: propagate fatal errors from lavfi.
-rw-r--r--avconv.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/avconv.c b/avconv.c
index fad0626c91..9df5bb30fc 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) {