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_aformat.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_aformat.c')
| -rw-r--r-- | libavfilter/af_aformat.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/libavfilter/af_aformat.c b/libavfilter/af_aformat.c index 4fdcb09d2d..1439177bd0 100644 --- a/libavfilter/af_aformat.c +++ b/libavfilter/af_aformat.c @@ -57,9 +57,10 @@ static const AVOption aformat_options[] = { AVFILTER_DEFINE_CLASS(aformat); -#define PARSE_FORMATS(str, type, list, add_to_list, get_fmt, none, desc) \ +#define PARSE_FORMATS(str, type, list, add_to_list, unref_fn, get_fmt, none, desc) \ do { \ char *next, *cur = str, sep; \ + int ret; \ \ if (str && strchr(str, ',')) { \ av_log(ctx, AV_LOG_WARNING, "This syntax is deprecated, use '|' to "\ @@ -78,7 +79,10 @@ do { \ av_log(ctx, AV_LOG_ERROR, "Error parsing " desc ": %s.\n", cur);\ return AVERROR(EINVAL); \ } \ - add_to_list(&list, fmt); \ + if ((ret = add_to_list(&list, fmt)) < 0) { \ + unref_fn(&list); \ + return ret; \ + } \ \ cur = next; \ } \ @@ -95,11 +99,11 @@ static av_cold int init(AVFilterContext *ctx) AFormatContext *s = ctx->priv; PARSE_FORMATS(s->formats_str, enum AVSampleFormat, s->formats, - ff_add_format, av_get_sample_fmt, AV_SAMPLE_FMT_NONE, "sample format"); - PARSE_FORMATS(s->sample_rates_str, int, s->sample_rates, ff_add_format, + ff_add_format, ff_formats_unref, av_get_sample_fmt, AV_SAMPLE_FMT_NONE, "sample format"); + PARSE_FORMATS(s->sample_rates_str, int, s->sample_rates, ff_add_format, ff_formats_unref, get_sample_rate, 0, "sample rate"); PARSE_FORMATS(s->channel_layouts_str, uint64_t, s->channel_layouts, - ff_add_channel_layout, av_get_channel_layout, 0, + ff_add_channel_layout, ff_channel_layouts_unref, av_get_channel_layout, 0, "channel layout"); return 0; |