summaryrefslogtreecommitdiff
path: root/libavfilter/vf_yadif.c
diff options
context:
space:
mode:
authorRobert Nagy <ronag89@gmail.com>2012-04-15 15:46:37 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-04-15 23:44:38 +0200
commit4d84c7ded67141cdadaf052df01d9bd8940119ad (patch)
tree23924a55408f56312d209b65cbba5961c80633ed /libavfilter/vf_yadif.c
parent3be0c86b97e50df62aadcf846caa2455fe42434c (diff)
yadif: fixed missing error handling for poll_frame.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_yadif.c')
-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 4ade615c4d..c31a283bad 100644
--- a/libavfilter/vf_yadif.c
+++ b/libavfilter/vf_yadif.c
@@ -314,11 +314,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);