aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Nagy <ronag89@gmail.com>2012-04-15 15:46:37 +0200
committerDiego Biurrun <diego@biurrun.de>2012-05-07 10:26:57 +0200
commita07578f3f2a5ad5cd5dcc5de5ee173254f191435 (patch)
treeea73adef4ad529ce7a5d3768e9540467f2fb95a0
parent08354bf45849cba65fe6336908e5b9cfec5e28a2 (diff)
downloadffmpeg-a07578f3f2a5ad5cd5dcc5de5ee173254f191435.tar.gz
vf_yadif: fix missing error handling for avfilter_poll_frame()
-rw-r--r--libavfilter/vf_yadif.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c
index 12b37836f8..790dda5a0b 100644
--- a/libavfilter/vf_yadif.c
+++ b/libavfilter/vf_yadif.c
@@ -316,11 +316,15 @@ static int poll_frame(AVFilterLink *link)
return 1;
val = avfilter_poll_frame(link->src->inputs[0]);
+ if (val <= 0)
+ return val;
if (val==1 && !yadif->next) { //FIXME change API to not requre this red tape
if ((ret = avfilter_request_frame(link->src->inputs[0])) < 0)
return ret;
val = avfilter_poll_frame(link->src->inputs[0]);
+ if (val <= 0)
+ return val;
}
assert(yadif->next || !val);