aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/af_amerge.c
diff options
context:
space:
mode:
authorGanesh Ajjanagadde <gajjanagadde@gmail.com>2015-10-04 23:39:25 -0400
committerGanesh Ajjanagadde <gajjanagadde@gmail.com>2015-10-14 10:04:01 -0400
commit6aaac24d72a7da631173209841a3944fcb4a3309 (patch)
tree4b475e1648073cd36acad767e54486722ac3c15f /libavfilter/af_amerge.c
parent8ededd583622359062622cf008144a1511d50bbd (diff)
downloadffmpeg-6aaac24d72a7da631173209841a3944fcb4a3309.tar.gz
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/af_amerge.c')
-rw-r--r--libavfilter/af_amerge.c21
1 files changed, 13 insertions, 8 deletions
diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c
index 410d6134d7..2b4edb09ff 100644
--- a/libavfilter/af_amerge.c
+++ b/libavfilter/af_amerge.c
@@ -78,7 +78,7 @@ static int query_formats(AVFilterContext *ctx)
int64_t inlayout[SWR_CH_MAX], outlayout = 0;
AVFilterFormats *formats;
AVFilterChannelLayouts *layouts;
- int i, overlap = 0, nb_ch = 0;
+ int i, ret, overlap = 0, nb_ch = 0;
for (i = 0; i < s->nb_inputs; i++) {
if (!ctx->inputs[i]->in_channel_layouts ||
@@ -125,17 +125,22 @@ static int query_formats(AVFilterContext *ctx)
*(route[i]++) = out_ch_number++;
}
formats = ff_make_format_list(ff_packed_sample_fmts_array);
- ff_set_common_formats(ctx, formats);
+ if ((ret = ff_set_common_formats(ctx, formats)) < 0)
+ return ret;
for (i = 0; i < s->nb_inputs; i++) {
layouts = NULL;
- ff_add_channel_layout(&layouts, inlayout[i]);
- ff_channel_layouts_ref(layouts, &ctx->inputs[i]->out_channel_layouts);
+ if ((ret = ff_add_channel_layout(&layouts, inlayout[i])) < 0)
+ return ret;
+ if ((ret = ff_channel_layouts_ref(layouts, &ctx->inputs[i]->out_channel_layouts)) < 0)
+ return ret;
}
layouts = NULL;
- ff_add_channel_layout(&layouts, outlayout);
- ff_channel_layouts_ref(layouts, &ctx->outputs[0]->in_channel_layouts);
- ff_set_common_samplerates(ctx, ff_all_samplerates());
- return 0;
+ if ((ret = ff_add_channel_layout(&layouts, outlayout)) < 0)
+ return ret;
+ if ((ret = ff_channel_layouts_ref(layouts, &ctx->outputs[0]->in_channel_layouts)) < 0)
+ return ret;
+
+ return ff_set_common_samplerates(ctx, ff_all_samplerates());
}
static int config_output(AVFilterLink *outlink)