X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Faf_aformat.c;h=4fdcb09d2d49393bd4bf0467f80a53b5a3c74caf;hb=16576a66626a3fdf3d599955bc69eae0a4c08647;hp=5fd0308d796995624b30a3259ec17d7ee8b19990;hpb=0cb46c1e0ece95b65933cc9f72d80c08cef417a5;p=ffmpeg diff --git a/libavfilter/af_aformat.c b/libavfilter/af_aformat.c index 5fd0308d796..4fdcb09d2d4 100644 --- a/libavfilter/af_aformat.c +++ b/libavfilter/af_aformat.c @@ -108,15 +108,18 @@ static av_cold int init(AVFilterContext *ctx) static int query_formats(AVFilterContext *ctx) { AFormatContext *s = ctx->priv; + int ret; - ff_set_common_formats(ctx, s->formats ? s->formats : + ret = ff_set_common_formats(ctx, s->formats ? s->formats : ff_all_formats(AVMEDIA_TYPE_AUDIO)); - ff_set_common_samplerates(ctx, s->sample_rates ? s->sample_rates : + if (ret < 0) + return ret; + ret = ff_set_common_samplerates(ctx, s->sample_rates ? s->sample_rates : ff_all_samplerates()); - ff_set_common_channel_layouts(ctx, s->channel_layouts ? s->channel_layouts : + if (ret < 0) + return ret; + return ff_set_common_channel_layouts(ctx, s->channel_layouts ? s->channel_layouts : ff_all_channel_counts()); - - return 0; } static const AVFilterPad avfilter_af_aformat_inputs[] = {