[FFmpeg-cvslog] yadif: fixed missing error handling for poll_frame.

Robert Nagy git at videolan.org
Mon Apr 16 00:11:30 CEST 2012


ffmpeg | branch: master | Robert Nagy <ronag89 at gmail.com> | Sun Apr 15 15:46:37 2012 +0200| [4d84c7ded67141cdadaf052df01d9bd8940119ad] | committer: Michael Niedermayer

yadif: fixed missing error handling for poll_frame.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavfilter/vf_yadif.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c
index 4ade615..c31a283 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);
 



More information about the ffmpeg-cvslog mailing list