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_pan.c | |
parent | 8ededd583622359062622cf008144a1511d50bbd (diff) | |
download | ffmpeg-streaming-6aaac24d72a7da631173209841a3944fcb4a3309.zip ffmpeg-streaming-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_pan.c')
-rw-r--r-- | libavfilter/af_pan.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c index 9117cc0..1eb102c 100644 --- a/libavfilter/af_pan.c +++ b/libavfilter/af_pan.c @@ -227,27 +227,29 @@ static int query_formats(AVFilterContext *ctx) AVFilterLink *outlink = ctx->outputs[0]; AVFilterFormats *formats = NULL; AVFilterChannelLayouts *layouts; + int ret; pan->pure_gains = are_gains_pure(pan); /* libswr supports any sample and packing formats */ - ff_set_common_formats(ctx, ff_all_formats(AVMEDIA_TYPE_AUDIO)); + if ((ret = ff_set_common_formats(ctx, ff_all_formats(AVMEDIA_TYPE_AUDIO))) < 0) + return ret; formats = ff_all_samplerates(); - if (!formats) - return AVERROR(ENOMEM); - ff_set_common_samplerates(ctx, formats); + if ((ret = ff_set_common_samplerates(ctx, formats)) < 0) + return ret; // inlink supports any channel layout layouts = ff_all_channel_counts(); - ff_channel_layouts_ref(layouts, &inlink->out_channel_layouts); + if ((ret = ff_channel_layouts_ref(layouts, &inlink->out_channel_layouts)) < 0) + return ret; // outlink supports only requested output channel layout layouts = NULL; - ff_add_channel_layout(&layouts, + if ((ret = ff_add_channel_layout(&layouts, pan->out_channel_layout ? pan->out_channel_layout : - FF_COUNT2LAYOUT(pan->nb_output_channels)); - ff_channel_layouts_ref(layouts, &outlink->in_channel_layouts); - return 0; + FF_COUNT2LAYOUT(pan->nb_output_channels))) < 0) + return ret; + return ff_channel_layouts_ref(layouts, &outlink->in_channel_layouts); } static int config_props(AVFilterLink *link) |