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/af_stereotools.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'libavfilter/af_stereotools.c') diff --git a/libavfilter/af_stereotools.c b/libavfilter/af_stereotools.c index 6a3265d631..e19ada47d0 100644 --- a/libavfilter/af_stereotools.c +++ b/libavfilter/af_stereotools.c @@ -92,16 +92,15 @@ static int query_formats(AVFilterContext *ctx) { AVFilterFormats *formats = NULL; AVFilterChannelLayouts *layout = NULL; + int ret; - ff_add_format(&formats, AV_SAMPLE_FMT_DBL); - ff_set_common_formats(ctx, formats); - ff_add_channel_layout(&layout, AV_CH_LAYOUT_STEREO); - ff_set_common_channel_layouts(ctx, layout); + if ((ret = ff_add_format (&formats, AV_SAMPLE_FMT_DBL )) < 0 || + (ret = ff_set_common_formats (ctx , formats )) < 0 || + (ret = ff_add_channel_layout (&layout , AV_CH_LAYOUT_STEREO)) < 0 || + (ret = ff_set_common_channel_layouts (ctx , layout )) < 0) + return ret; formats = ff_all_samplerates(); - if (!formats) - return AVERROR(ENOMEM); - return ff_set_common_samplerates(ctx, formats); } -- cgit v1.2.3