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_replaygain.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_replaygain.c')
-rw-r--r-- | libavfilter/af_replaygain.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/libavfilter/af_replaygain.c b/libavfilter/af_replaygain.c index c41985787d..c8f6f9666d 100644 --- a/libavfilter/af_replaygain.c +++ b/libavfilter/af_replaygain.c @@ -323,19 +323,21 @@ static int query_formats(AVFilterContext *ctx) { AVFilterFormats *formats = NULL; AVFilterChannelLayouts *layout = NULL; - int i; + int i, ret; - ff_add_format(&formats, AV_SAMPLE_FMT_FLT); - ff_set_common_formats(ctx, formats); - ff_add_channel_layout(&layout, AV_CH_LAYOUT_STEREO); - ff_set_common_channel_layouts(ctx, layout); + if ((ret = ff_add_format (&formats, AV_SAMPLE_FMT_FLT )) < 0 || + (ret = ff_set_common_formats (ctx , formats )) < 0 || + (ret = ff_add_channel_layout (&layout , AV_CH_LAYOUT_STEREO)) < 0 || + (ret = ff_set_common_channel_layouts (ctx , layout )) < 0) + return ret; formats = NULL; - for (i = 0; i < FF_ARRAY_ELEMS(freqinfos); i++) - ff_add_format(&formats, freqinfos[i].sample_rate); - ff_set_common_samplerates(ctx, formats); + for (i = 0; i < FF_ARRAY_ELEMS(freqinfos); i++) { + if ((ret = ff_add_format(&formats, freqinfos[i].sample_rate)) < 0) + return ret; + } - return 0; + return ff_set_common_samplerates(ctx, formats); } static int config_input(AVFilterLink *inlink) |