From a0854c084ea1541591c54aaab1f993ebaf92ffaf Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Fri, 3 Apr 2015 17:55:18 +0000 Subject: avfilter: handle error in query_formats() in bunch of filters Signed-off-by: Paul B Mahol --- libavfilter/af_silencedetect.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'libavfilter/af_silencedetect.c') diff --git a/libavfilter/af_silencedetect.c b/libavfilter/af_silencedetect.c index 687d2e7ed1..b048d63738 100644 --- a/libavfilter/af_silencedetect.c +++ b/libavfilter/af_silencedetect.c @@ -164,23 +164,26 @@ static int query_formats(AVFilterContext *ctx) AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }; + int ret; layouts = ff_all_channel_layouts(); if (!layouts) return AVERROR(ENOMEM); - ff_set_common_channel_layouts(ctx, layouts); + ret = ff_set_common_channel_layouts(ctx, layouts); + if (ret < 0) + return ret; formats = ff_make_format_list(sample_fmts); if (!formats) return AVERROR(ENOMEM); - ff_set_common_formats(ctx, formats); + ret = ff_set_common_formats(ctx, formats); + if (ret < 0) + return ret; formats = ff_all_samplerates(); if (!formats) return AVERROR(ENOMEM); - ff_set_common_samplerates(ctx, formats); - - return 0; + return ff_set_common_samplerates(ctx, formats); } static const AVFilterPad silencedetect_inputs[] = { -- cgit v1.2.3