[FFmpeg-devel] [PATCH] lavfi/avfiltergraph: check pick_format return code.

Stefano Sabatini stefasab at gmail.com
Wed Jan 2 16:54:02 CET 2013


On date Wednesday 2013-01-02 15:46:36 +0100, Nicolas George encoded:
> 
> Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
> ---
>  libavfilter/avfiltergraph.c |    9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
> index f144624..10f9b7e 100644
> --- a/libavfilter/avfiltergraph.c
> +++ b/libavfilter/avfiltergraph.c
> @@ -795,7 +795,8 @@ static int pick_formats(AVFilterGraph *graph)
>              if (filter->nb_inputs){
>                  for (j = 0; j < filter->nb_inputs; j++){
>                      if(filter->inputs[j]->in_formats && filter->inputs[j]->in_formats->format_count == 1) {
> -                        pick_format(filter->inputs[j], NULL);
> +                        if ((ret = pick_format(filter->inputs[j], NULL)) < 0)
> +                            return ret;
>                          change = 1;
>                      }
>                  }
> @@ -803,7 +804,8 @@ static int pick_formats(AVFilterGraph *graph)
>              if (filter->nb_outputs){
>                  for (j = 0; j < filter->nb_outputs; j++){
>                      if(filter->outputs[j]->in_formats && filter->outputs[j]->in_formats->format_count == 1) {
> -                        pick_format(filter->outputs[j], NULL);
> +                        if ((ret = pick_format(filter->outputs[j], NULL)) < 0)
> +                            return ret;
>                          change = 1;
>                      }
>                  }
> @@ -811,7 +813,8 @@ static int pick_formats(AVFilterGraph *graph)
>              if (filter->nb_inputs && filter->nb_outputs && filter->inputs[0]->format>=0) {
>                  for (j = 0; j < filter->nb_outputs; j++) {
>                      if(filter->outputs[j]->format<0) {
> -                        pick_format(filter->outputs[j], filter->inputs[0]);
> +                        if ((ret = pick_format(filter->outputs[j], filter->inputs[0])) < 0)
> +                            return ret;
>                          change = 1;
>                      }
>                  }

LGTM, thanks.
-- 
FFmpeg = Frenzy Faithful Multimedia Portable Enchanting Glue


More information about the ffmpeg-devel mailing list