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/af_channelsplit.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/af_channelsplit.c')
-rw-r--r-- | libavfilter/af_channelsplit.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/libavfilter/af_channelsplit.c b/libavfilter/af_channelsplit.c index b3756e2be9..f50414984a 100644 --- a/libavfilter/af_channelsplit.c +++ b/libavfilter/af_channelsplit.c @@ -82,20 +82,23 @@ static int query_formats(AVFilterContext *ctx) { ChannelSplitContext *s = ctx->priv; AVFilterChannelLayouts *in_layouts = NULL; - int i; + int i, 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; - ff_add_channel_layout(&in_layouts, s->channel_layout); - ff_channel_layouts_ref(in_layouts, &ctx->inputs[0]->out_channel_layouts); + if ((ret = ff_add_channel_layout(&in_layouts, s->channel_layout)) < 0 || + (ret = ff_channel_layouts_ref(in_layouts, &ctx->inputs[0]->out_channel_layouts)) < 0) + return ret; for (i = 0; i < ctx->nb_outputs; i++) { AVFilterChannelLayouts *out_layouts = NULL; uint64_t channel = av_channel_layout_extract_channel(s->channel_layout, i); - ff_add_channel_layout(&out_layouts, channel); - ff_channel_layouts_ref(out_layouts, &ctx->outputs[i]->in_channel_layouts); + if ((ret = ff_add_channel_layout(&out_layouts, channel)) < 0 || + (ret = ff_channel_layouts_ref(out_layouts, &ctx->outputs[i]->in_channel_layouts)) < 0) + return ret; } return 0; |