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/buffersink.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/buffersink.c')
-rw-r--r-- | libavfilter/buffersink.c | 35 |
1 files changed, 15 insertions, 20 deletions
diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c index 3206bd9dfe..5db86abd8a 100644 --- a/libavfilter/buffersink.c +++ b/libavfilter/buffersink.c @@ -302,13 +302,13 @@ static int vsink_query_formats(AVFilterContext *ctx) CHECK_LIST_SIZE(pixel_fmts) if (buf->pixel_fmts_size) { for (i = 0; i < NB_ITEMS(buf->pixel_fmts); i++) - if ((ret = ff_add_format(&formats, buf->pixel_fmts[i])) < 0) { - ff_formats_unref(&formats); + if ((ret = ff_add_format(&formats, buf->pixel_fmts[i])) < 0) return ret; - } - ff_set_common_formats(ctx, formats); + if ((ret = ff_set_common_formats(ctx, formats)) < 0) + return ret; } else { - ff_default_query_formats(ctx); + if ((ret = ff_default_query_formats(ctx)) < 0) + return ret; } return 0; @@ -346,25 +346,20 @@ static int asink_query_formats(AVFilterContext *ctx) if (buf->sample_fmts_size) { for (i = 0; i < NB_ITEMS(buf->sample_fmts); i++) - if ((ret = ff_add_format(&formats, buf->sample_fmts[i])) < 0) { - ff_formats_unref(&formats); + if ((ret = ff_add_format(&formats, buf->sample_fmts[i])) < 0) return ret; - } - ff_set_common_formats(ctx, formats); + if ((ret = ff_set_common_formats(ctx, formats)) < 0) + return ret; } if (buf->channel_layouts_size || buf->channel_counts_size || buf->all_channel_counts) { for (i = 0; i < NB_ITEMS(buf->channel_layouts); i++) - if ((ret = ff_add_channel_layout(&layouts, buf->channel_layouts[i])) < 0) { - ff_channel_layouts_unref(&layouts); + if ((ret = ff_add_channel_layout(&layouts, buf->channel_layouts[i])) < 0) return ret; - } for (i = 0; i < NB_ITEMS(buf->channel_counts); i++) - if ((ret = ff_add_channel_layout(&layouts, FF_COUNT2LAYOUT(buf->channel_counts[i]))) < 0) { - ff_channel_layouts_unref(&layouts); + if ((ret = ff_add_channel_layout(&layouts, FF_COUNT2LAYOUT(buf->channel_counts[i]))) < 0) return ret; - } if (buf->all_channel_counts) { if (layouts) av_log(ctx, AV_LOG_WARNING, @@ -372,17 +367,17 @@ static int asink_query_formats(AVFilterContext *ctx) else if (!(layouts = ff_all_channel_counts())) return AVERROR(ENOMEM); } - ff_set_common_channel_layouts(ctx, layouts); + if ((ret = ff_set_common_channel_layouts(ctx, layouts)) < 0) + return ret; } if (buf->sample_rates_size) { formats = NULL; for (i = 0; i < NB_ITEMS(buf->sample_rates); i++) - if ((ret = ff_add_format(&formats, buf->sample_rates[i])) < 0) { - ff_formats_unref(&formats); + if ((ret = ff_add_format(&formats, buf->sample_rates[i])) < 0) return ret; - } - ff_set_common_samplerates(ctx, formats); + if ((ret = ff_set_common_samplerates(ctx, formats)) < 0) + return ret; } return 0; |