From 6aaac24d72a7da631173209841a3944fcb4a3309 Mon Sep 17 00:00:00 2001 From: Ganesh Ajjanagadde Date: Sun, 4 Oct 2015 23:39:25 -0400 Subject: avfilter/all: propagate errors of functions from avfilter/formats MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Previous version Reviewed-by: Nicolas George Previous version Reviewed-by: Clément Bœsch Signed-off-by: Ganesh Ajjanagadde --- libavfilter/avf_aphasemeter.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'libavfilter/avf_aphasemeter.c') diff --git a/libavfilter/avf_aphasemeter.c b/libavfilter/avf_aphasemeter.c index 5a470cf921..7c1e9932a6 100644 --- a/libavfilter/avf_aphasemeter.c +++ b/libavfilter/avf_aphasemeter.c @@ -70,24 +70,21 @@ static int query_formats(AVFilterContext *ctx) AVFilterLink *outlink = ctx->outputs[0]; static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_NONE }; static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_RGBA, AV_PIX_FMT_NONE }; + int ret; formats = ff_make_format_list(sample_fmts); - if (!formats) - return AVERROR(ENOMEM); - ff_formats_ref(formats, &inlink->out_formats); - - ff_add_channel_layout(&layout, AV_CH_LAYOUT_STEREO); - ff_channel_layouts_ref(layout, &inlink->out_channel_layouts); + if ((ret = ff_formats_ref (formats, &inlink->out_formats )) < 0 || + (ret = ff_add_channel_layout (&layout, AV_CH_LAYOUT_STEREO )) < 0 || + (ret = ff_channel_layouts_ref (layout , &inlink->out_channel_layouts)) < 0) + return ret; formats = ff_all_samplerates(); - if (!formats) - return AVERROR(ENOMEM); - ff_formats_ref(formats, &inlink->out_samplerates); + if ((ret = ff_formats_ref(formats, &inlink->out_samplerates)) < 0) + return ret; formats = ff_make_format_list(pix_fmts); - if (!formats) - return AVERROR(ENOMEM); - ff_formats_ref(formats, &outlink->in_formats); + if ((ret = ff_formats_ref(formats, &outlink->in_formats)) < 0) + return ret; return 0; } -- cgit v1.2.3