diff options
| author | Ganesh Ajjanagadde <gajjanagadde@gmail.com> | 2015-10-04 23:39:25 -0400 |
|---|---|---|
| committer | Ganesh Ajjanagadde <gajjanagadde@gmail.com> | 2015-10-14 10:04:01 -0400 |
| commit | 6aaac24d72a7da631173209841a3944fcb4a3309 (patch) | |
| tree | 4b475e1648073cd36acad767e54486722ac3c15f /libavfilter/vf_scale.c | |
| parent | 8ededd583622359062622cf008144a1511d50bbd (diff) | |
avfilter/all: propagate errors of functions from avfilter/formats
Many of the functions from avfilter/formats can return errors, usually AVERROR(ENOMEM).
This propagates the return values.
All of these were found by using av_warn_unused_result, demonstrating its utility.
Tested with FATE. I am least sure of the changes to avfilter/filtergraph,
since I don't know what/how reduce_format is intended to behave and how it should
react to errors.
Fixes: CID 1325680, 1325679, 1325678.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Previous version Reviewed-by: Nicolas George <george@nsup.org>
Previous version Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Diffstat (limited to 'libavfilter/vf_scale.c')
| -rw-r--r-- | libavfilter/vf_scale.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index fd98abf7ea..1032688021 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -188,11 +188,11 @@ static int query_formats(AVFilterContext *ctx) if ((sws_isSupportedInput(pix_fmt) || sws_isSupportedEndiannessConversion(pix_fmt)) && (ret = ff_add_format(&formats, pix_fmt)) < 0) { - ff_formats_unref(&formats); return ret; } } - ff_formats_ref(formats, &ctx->inputs[0]->out_formats); + if ((ret = ff_formats_ref(formats, &ctx->inputs[0]->out_formats)) < 0) + return ret; } if (ctx->outputs[0]) { const AVPixFmtDescriptor *desc = NULL; @@ -202,11 +202,11 @@ static int query_formats(AVFilterContext *ctx) if ((sws_isSupportedOutput(pix_fmt) || pix_fmt == AV_PIX_FMT_PAL8 || sws_isSupportedEndiannessConversion(pix_fmt)) && (ret = ff_add_format(&formats, pix_fmt)) < 0) { - ff_formats_unref(&formats); return ret; } } - ff_formats_ref(formats, &ctx->outputs[0]->in_formats); + if ((ret = ff_formats_ref(formats, &ctx->outputs[0]->in_formats)) < 0) + return ret; } return 0; |