projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
08354bf
)
vf_yadif: fix missing error handling for avfilter_poll_frame()
author
Robert Nagy
<ronag89@gmail.com>
Sun, 15 Apr 2012 13:46:37 +0000
(15:46 +0200)
committer
Diego Biurrun
<diego@biurrun.de>
Mon, 7 May 2012 08:26:57 +0000
(10:26 +0200)
libavfilter/vf_yadif.c
patch
|
blob
|
history
diff --git
a/libavfilter/vf_yadif.c
b/libavfilter/vf_yadif.c
index
12b3783
..
790dda5
100644
(file)
--- 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);