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_earwax.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_earwax.c')
| -rw-r--r-- | libavfilter/af_earwax.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libavfilter/af_earwax.c b/libavfilter/af_earwax.c index c3109976f8..b0ba4cff65 100644 --- a/libavfilter/af_earwax.c +++ b/libavfilter/af_earwax.c @@ -78,15 +78,17 @@ typedef struct { static int query_formats(AVFilterContext *ctx) { static const int sample_rates[] = { 44100, -1 }; + int ret; AVFilterFormats *formats = NULL; AVFilterChannelLayouts *layout = NULL; - ff_add_format(&formats, AV_SAMPLE_FMT_S16); - ff_set_common_formats(ctx, formats); - ff_add_channel_layout(&layout, AV_CH_LAYOUT_STEREO); - ff_set_common_channel_layouts(ctx, layout); - ff_set_common_samplerates(ctx, ff_make_format_list(sample_rates)); + if ((ret = ff_add_format (&formats, AV_SAMPLE_FMT_S16 )) < 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 || + (ret = ff_set_common_samplerates (ctx , ff_make_format_list(sample_rates) )) < 0) + return ret; return 0; } |