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_join.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'libavfilter/af_join.c') diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c index 4c1f6a075c..f5a1c5060d 100644 --- a/libavfilter/af_join.c +++ b/libavfilter/af_join.c @@ -245,20 +245,21 @@ static int join_query_formats(AVFilterContext *ctx) { JoinContext *s = ctx->priv; AVFilterChannelLayouts *layouts = NULL; - int i; + int i, ret; - ff_add_channel_layout(&layouts, s->channel_layout); - ff_channel_layouts_ref(layouts, &ctx->outputs[0]->in_channel_layouts); + if ((ret = ff_add_channel_layout(&layouts, s->channel_layout)) < 0 || + (ret = ff_channel_layouts_ref(layouts, &ctx->outputs[0]->in_channel_layouts)) < 0) + return ret; for (i = 0; i < ctx->nb_inputs; i++) { layouts = ff_all_channel_layouts(); - if (!layouts) - return AVERROR(ENOMEM); - ff_channel_layouts_ref(layouts, &ctx->inputs[i]->out_channel_layouts); + if ((ret = ff_channel_layouts_ref(layouts, &ctx->inputs[i]->out_channel_layouts)) < 0) + return ret; } - ff_set_common_formats (ctx, ff_planar_sample_fmts()); - ff_set_common_samplerates(ctx, ff_all_samplerates()); + if ((ret = ff_set_common_formats(ctx, ff_planar_sample_fmts())) < 0 || + (ret = ff_set_common_samplerates(ctx, ff_all_samplerates())) < 0) + return ret; return 0; } -- cgit v1.2.3