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_amix.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_amix.c')
-rw-r--r-- | libavfilter/af_amix.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c index 9a3cbd4dcd..434dd907f6 100644 --- a/libavfilter/af_amix.c +++ b/libavfilter/af_amix.c @@ -537,12 +537,13 @@ static int query_formats(AVFilterContext *ctx) int ret; layouts = ff_all_channel_layouts(); - if (!layouts) return AVERROR(ENOMEM); - ff_add_format(&formats, AV_SAMPLE_FMT_FLT); - ff_add_format(&formats, AV_SAMPLE_FMT_FLTP); + if ((ret = ff_add_format(&formats, AV_SAMPLE_FMT_FLT)) < 0) + return ret; + if ((ret = ff_add_format(&formats, AV_SAMPLE_FMT_FLTP)) < 0) + return ret; ret = ff_set_common_formats(ctx, formats); if (ret < 0) return ret; |