diff options
| author | Ganesh Ajjanagadde <gajjanagadde@gmail.com> | 2015-10-04 23:39:25 -0400 |
|---|---|---|
| committer | Ganesh Ajjanagadde <gajjanagadde@gmail.com> | 2015-10-14 10:04:01 -0400 |
| commit | 6aaac24d72a7da631173209841a3944fcb4a3309 (patch) | |
| tree | 4b475e1648073cd36acad767e54486722ac3c15f /libavfilter/af_channelmap.c | |
| parent | 8ededd583622359062622cf008144a1511d50bbd (diff) | |
| download | ffmpeg-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_channelmap.c')
| -rw-r--r-- | libavfilter/af_channelmap.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c index 37b47b2d7b..9e95a98d00 100644 --- a/libavfilter/af_channelmap.c +++ b/libavfilter/af_channelmap.c @@ -289,18 +289,15 @@ static int channelmap_query_formats(AVFilterContext *ctx) ChannelMapContext *s = ctx->priv; AVFilterChannelLayouts *layouts; AVFilterChannelLayouts *channel_layouts = NULL; + int ret; layouts = ff_all_channel_layouts(); - if (!layouts) - return AVERROR(ENOMEM); - - ff_add_channel_layout(&channel_layouts, s->output_layout); - - ff_set_common_formats(ctx, ff_planar_sample_fmts()); - ff_set_common_samplerates(ctx, ff_all_samplerates()); - - ff_channel_layouts_ref(layouts, &ctx->inputs[0]->out_channel_layouts); - ff_channel_layouts_ref(channel_layouts, &ctx->outputs[0]->in_channel_layouts); + if ((ret = ff_add_channel_layout (&channel_layouts, s->output_layout )) < 0 || + (ret = ff_set_common_formats (ctx , ff_planar_sample_fmts() )) < 0 || + (ret = ff_set_common_samplerates (ctx , ff_all_samplerates() )) < 0 || + (ret = ff_channel_layouts_ref (layouts , &ctx->inputs[0]->out_channel_layouts)) < 0 || + (ret = ff_channel_layouts_ref (channel_layouts , &ctx->outputs[0]->in_channel_layouts)) < 0) + return ret; return 0; } |