diff options
| author | Ganesh Ajjanagadde <gajjanagadde@gmail.com> | 2015-10-05 06:39:25 +0300 |
|---|---|---|
| committer | Ganesh Ajjanagadde <gajjanagadde@gmail.com> | 2015-10-14 17:04:01 +0300 |
| commit | 6aaac24d72a7da631173209841a3944fcb4a3309 (patch) | |
| tree | 4b475e1648073cd36acad767e54486722ac3c15f /libavfilter/vf_histogram.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_histogram.c')
| -rw-r--r-- | libavfilter/vf_histogram.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavfilter/vf_histogram.c b/libavfilter/vf_histogram.c index d8e935a28e..12ab21ce56 100644 --- a/libavfilter/vf_histogram.c +++ b/libavfilter/vf_histogram.c @@ -155,6 +155,7 @@ static int query_formats(AVFilterContext *ctx) HistogramContext *h = ctx->priv; const enum AVPixelFormat *pix_fmts; AVFilterFormats *fmts_list; + int ret; switch (h->mode) { case MODE_WAVEFORM: @@ -173,7 +174,8 @@ static int query_formats(AVFilterContext *ctx) } if (!ctx->inputs[0]->out_formats) - ff_formats_ref(ff_make_format_list(levels_in_pix_fmts), &ctx->inputs[0]->out_formats); + if ((ret = ff_formats_ref(ff_make_format_list(levels_in_pix_fmts), &ctx->inputs[0]->out_formats)) < 0) + return ret; avff = ctx->inputs[0]->in_formats; desc = av_pix_fmt_desc_get(avff->formats[0]); rgb = desc->flags & AV_PIX_FMT_FLAG_RGB; @@ -197,7 +199,8 @@ static int query_formats(AVFilterContext *ctx) out_pix_fmts = levels_out_yuv9_pix_fmts; else // if (bits == 10) out_pix_fmts = levels_out_yuv10_pix_fmts; - ff_formats_ref(ff_make_format_list(out_pix_fmts), &ctx->outputs[0]->in_formats); + if ((ret = ff_formats_ref(ff_make_format_list(out_pix_fmts), &ctx->outputs[0]->in_formats)) < 0) + return ret; return 0; } |