[FFmpeg-devel] [PATCH] Fixed missing error handling in yadif poll_frame

[Michael Niedermayer]

On Sun, Apr 15, 2012 at 11:46:36AM +0200, Robert Nagy wrote:
> Fixed tabs and incorrect poll_frame call.

>  vf_yadif.c |    4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 9968bc867662d78692dd624b77fbe90dbca7d14d  0001-Fixed-missing-error-handling-for-yadif-poll_frame.patch
> From c5f12f93945f994385be05f6feb04176cc5a6a0a Mon Sep 17 00:00:00 2001
> From: Robert Nagy <ronag89 at gmail.com>
> Date: Sat, 14 Apr 2012 20:34:37 +0200
> Subject: [PATCH 1/2] Fixed missing error handling for yadif poll_frame.
> 
> ---
>  libavfilter/vf_yadif.c |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c
> index 4ade615..548ee9e 100644
> --- a/libavfilter/vf_yadif.c
> +++ b/libavfilter/vf_yadif.c
> @@ -314,11 +314,13 @@ 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]);
> +        return poll_frame(link);

ill wait a bit to give others a chance to comment but it does look ok

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The real ebay dictionary, page 1
"Used only once"    - "Some unspecified defect prevented a second use"
"In good condition" - "Can be repaird by experienced expert"
"As is" - "You wouldnt want it even if you were payed for it, if you knew ..."
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20120415/2e9d24ec/attachment.asc>