From 6aaac24d72a7da631173209841a3944fcb4a3309 Mon Sep 17 00:00:00 2001 From: Ganesh Ajjanagadde Date: Sun, 4 Oct 2015 23:39:25 -0400 Subject: avfilter/all: propagate errors of functions from avfilter/formats MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Previous version Reviewed-by: Nicolas George Previous version Reviewed-by: Clément Bœsch Signed-off-by: Ganesh Ajjanagadde --- libavfilter/buffersrc.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) (limited to 'libavfilter/buffersrc.c') diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index 45e219a084..3920b048db 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -314,23 +314,27 @@ static int query_formats(AVFilterContext *ctx) AVFilterChannelLayouts *channel_layouts = NULL; AVFilterFormats *formats = NULL; AVFilterFormats *samplerates = NULL; + int ret; switch (ctx->outputs[0]->type) { case AVMEDIA_TYPE_VIDEO: - ff_add_format(&formats, c->pix_fmt); - ff_set_common_formats(ctx, formats); + if ((ret = ff_add_format (&formats, c->pix_fmt)) < 0 || + (ret = ff_set_common_formats (ctx , formats )) < 0) + return ret; break; case AVMEDIA_TYPE_AUDIO: - ff_add_format(&formats, c->sample_fmt); - ff_set_common_formats(ctx, formats); - - ff_add_format(&samplerates, c->sample_rate); - ff_set_common_samplerates(ctx, samplerates); + if ((ret = ff_add_format (&formats , c->sample_fmt )) < 0 || + (ret = ff_set_common_formats (ctx , formats )) < 0 || + (ret = ff_add_format (&samplerates, c->sample_rate)) < 0 || + (ret = ff_set_common_samplerates (ctx , samplerates )) < 0) + return ret; - ff_add_channel_layout(&channel_layouts, + if ((ret = ff_add_channel_layout(&channel_layouts, c->channel_layout ? c->channel_layout : - FF_COUNT2LAYOUT(c->channels)); - ff_set_common_channel_layouts(ctx, channel_layouts); + FF_COUNT2LAYOUT(c->channels))) < 0) + return ret; + if ((ret = ff_set_common_channel_layouts(ctx, channel_layouts)) < 0) + return ret; break; default: return AVERROR(EINVAL); -- cgit v1.2.3