Signed-off-by: Paul B Mahol <onemda@gmail.com>tags/n2.7
| @@ -247,12 +247,28 @@ static int query_formats(AVFilterContext *ctx) | |||||
| static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_DBLP, AV_SAMPLE_FMT_NONE }; | static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_DBLP, AV_SAMPLE_FMT_NONE }; | ||||
| int64_t chlayouts[] = { eval->chlayout ? eval->chlayout : FF_COUNT2LAYOUT(eval->nb_channels) , -1 }; | int64_t chlayouts[] = { eval->chlayout ? eval->chlayout : FF_COUNT2LAYOUT(eval->nb_channels) , -1 }; | ||||
| int sample_rates[] = { eval->sample_rate, -1 }; | int sample_rates[] = { eval->sample_rate, -1 }; | ||||
| AVFilterFormats *formats; | |||||
| AVFilterChannelLayouts *layouts; | |||||
| int ret; | |||||
| formats = ff_make_format_list(sample_fmts); | |||||
| if (!formats) | |||||
| return AVERROR(ENOMEM); | |||||
| ret = ff_set_common_formats (ctx, formats); | |||||
| if (ret < 0) | |||||
| return ret; | |||||
| ff_set_common_formats (ctx, ff_make_format_list(sample_fmts)); | |||||
| ff_set_common_channel_layouts(ctx, avfilter_make_format64_list(chlayouts)); | |||||
| ff_set_common_samplerates(ctx, ff_make_format_list(sample_rates)); | |||||
| layouts = avfilter_make_format64_list(chlayouts); | |||||
| if (!layouts) | |||||
| return AVERROR(ENOMEM); | |||||
| ret = ff_set_common_channel_layouts(ctx, layouts); | |||||
| if (ret < 0) | |||||
| return ret; | |||||
| return 0; | |||||
| formats = ff_make_format_list(sample_rates); | |||||
| if (!formats) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_samplerates(ctx, formats); | |||||
| } | } | ||||
| static int request_frame(AVFilterLink *outlink) | static int request_frame(AVFilterLink *outlink) | ||||
| @@ -64,23 +64,26 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP, | AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP, | ||||
| AV_SAMPLE_FMT_NONE | AV_SAMPLE_FMT_NONE | ||||
| }; | }; | ||||
| int ret; | |||||
| layouts = ff_all_channel_layouts(); | layouts = ff_all_channel_layouts(); | ||||
| if (!layouts) | if (!layouts) | ||||
| return AVERROR(ENOMEM); | 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); | formats = ff_make_format_list(sample_fmts); | ||||
| if (!formats) | if (!formats) | ||||
| return AVERROR(ENOMEM); | 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(); | formats = ff_all_samplerates(); | ||||
| if (!formats) | if (!formats) | ||||
| return AVERROR(ENOMEM); | return AVERROR(ENOMEM); | ||||
| ff_set_common_samplerates(ctx, formats); | |||||
| return 0; | |||||
| return ff_set_common_samplerates(ctx, formats); | |||||
| } | } | ||||
| #define DELAY(name, type, fill) \ | #define DELAY(name, type, fill) \ | ||||
| @@ -158,23 +158,26 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP, | AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_DBLP, | ||||
| AV_SAMPLE_FMT_NONE | AV_SAMPLE_FMT_NONE | ||||
| }; | }; | ||||
| int ret; | |||||
| layouts = ff_all_channel_layouts(); | layouts = ff_all_channel_layouts(); | ||||
| if (!layouts) | if (!layouts) | ||||
| return AVERROR(ENOMEM); | 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); | formats = ff_make_format_list(sample_fmts); | ||||
| if (!formats) | if (!formats) | ||||
| return AVERROR(ENOMEM); | 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(); | formats = ff_all_samplerates(); | ||||
| if (!formats) | if (!formats) | ||||
| return AVERROR(ENOMEM); | return AVERROR(ENOMEM); | ||||
| ff_set_common_samplerates(ctx, formats); | |||||
| return 0; | |||||
| return ff_set_common_samplerates(ctx, formats); | |||||
| } | } | ||||
| #define MOD(a, b) (((a) >= (b)) ? (a) - (b) : (a)) | #define MOD(a, b) (((a) >= (b)) ? (a) - (b) : (a)) | ||||
| @@ -98,23 +98,26 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBLP, | AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBLP, | ||||
| AV_SAMPLE_FMT_NONE | AV_SAMPLE_FMT_NONE | ||||
| }; | }; | ||||
| int ret; | |||||
| layouts = ff_all_channel_layouts(); | layouts = ff_all_channel_layouts(); | ||||
| if (!layouts) | if (!layouts) | ||||
| return AVERROR(ENOMEM); | 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); | formats = ff_make_format_list(sample_fmts); | ||||
| if (!formats) | if (!formats) | ||||
| return AVERROR(ENOMEM); | 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(); | formats = ff_all_samplerates(); | ||||
| if (!formats) | if (!formats) | ||||
| return AVERROR(ENOMEM); | return AVERROR(ENOMEM); | ||||
| ff_set_common_samplerates(ctx, formats); | |||||
| return 0; | |||||
| return ff_set_common_samplerates(ctx, formats); | |||||
| } | } | ||||
| static double fade_gain(int curve, int64_t index, int range) | static double fade_gain(int curve, int64_t index, int range) | ||||
| @@ -108,15 +108,18 @@ static av_cold int init(AVFilterContext *ctx) | |||||
| static int query_formats(AVFilterContext *ctx) | static int query_formats(AVFilterContext *ctx) | ||||
| { | { | ||||
| AFormatContext *s = ctx->priv; | 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_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_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()); | ff_all_channel_counts()); | ||||
| return 0; | |||||
| } | } | ||||
| static const AVFilterPad avfilter_af_aformat_inputs[] = { | static const AVFilterPad avfilter_af_aformat_inputs[] = { | ||||
| @@ -534,6 +534,7 @@ static int query_formats(AVFilterContext *ctx) | |||||
| { | { | ||||
| AVFilterFormats *formats = NULL; | AVFilterFormats *formats = NULL; | ||||
| AVFilterChannelLayouts *layouts; | AVFilterChannelLayouts *layouts; | ||||
| int ret; | |||||
| layouts = ff_all_channel_layouts(); | layouts = ff_all_channel_layouts(); | ||||
| @@ -542,10 +543,13 @@ static int query_formats(AVFilterContext *ctx) | |||||
| ff_add_format(&formats, AV_SAMPLE_FMT_FLT); | ff_add_format(&formats, AV_SAMPLE_FMT_FLT); | ||||
| ff_add_format(&formats, AV_SAMPLE_FMT_FLTP); | ff_add_format(&formats, AV_SAMPLE_FMT_FLTP); | ||||
| ff_set_common_formats(ctx, formats); | |||||
| ff_set_common_channel_layouts(ctx, layouts); | |||||
| ff_set_common_samplerates(ctx, ff_all_samplerates()); | |||||
| return 0; | |||||
| ret = ff_set_common_formats(ctx, formats); | |||||
| if (ret < 0) | |||||
| return ret; | |||||
| ret = ff_set_common_channel_layouts(ctx, layouts); | |||||
| if (ret < 0) | |||||
| return ret; | |||||
| return ff_set_common_samplerates(ctx, ff_all_samplerates()); | |||||
| } | } | ||||
| static const AVFilterPad avfilter_af_amix_outputs[] = { | static const AVFilterPad avfilter_af_amix_outputs[] = { | ||||
| @@ -94,23 +94,26 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16P, | AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S16P, | ||||
| AV_SAMPLE_FMT_NONE | AV_SAMPLE_FMT_NONE | ||||
| }; | }; | ||||
| int ret; | |||||
| layouts = ff_all_channel_layouts(); | layouts = ff_all_channel_layouts(); | ||||
| if (!layouts) | if (!layouts) | ||||
| return AVERROR(ENOMEM); | 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); | formats = ff_make_format_list(sample_fmts); | ||||
| if (!formats) | if (!formats) | ||||
| return AVERROR(ENOMEM); | 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(); | formats = ff_all_samplerates(); | ||||
| if (!formats) | if (!formats) | ||||
| return AVERROR(ENOMEM); | return AVERROR(ENOMEM); | ||||
| ff_set_common_samplerates(ctx, formats); | |||||
| return 0; | |||||
| return ff_set_common_samplerates(ctx, formats); | |||||
| } | } | ||||
| #define MOD(a, b) (((a) >= (b)) ? (a) - (b) : (a)) | #define MOD(a, b) (((a) >= (b)) ? (a) - (b) : (a)) | ||||
| @@ -51,9 +51,8 @@ static av_cold int query_formats(AVFilterContext *ctx) | |||||
| ASetRateContext *sr = ctx->priv; | ASetRateContext *sr = ctx->priv; | ||||
| int sample_rates[] = { sr->sample_rate, -1 }; | int sample_rates[] = { sr->sample_rate, -1 }; | ||||
| ff_formats_ref(ff_make_format_list(sample_rates), | |||||
| return ff_formats_ref(ff_make_format_list(sample_rates), | |||||
| &ctx->outputs[0]->in_samplerates); | &ctx->outputs[0]->in_samplerates); | ||||
| return 0; | |||||
| } | } | ||||
| static av_cold int config_props(AVFilterLink *outlink) | static av_cold int config_props(AVFilterLink *outlink) | ||||
| @@ -64,23 +64,26 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBLP, | AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_DBLP, | ||||
| AV_SAMPLE_FMT_NONE | AV_SAMPLE_FMT_NONE | ||||
| }; | }; | ||||
| int ret; | |||||
| layouts = ff_all_channel_layouts(); | layouts = ff_all_channel_layouts(); | ||||
| if (!layouts) | if (!layouts) | ||||
| return AVERROR(ENOMEM); | 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); | formats = ff_make_format_list(sample_fmts); | ||||
| if (!formats) | if (!formats) | ||||
| return AVERROR(ENOMEM); | 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(); | formats = ff_all_samplerates(); | ||||
| if (!formats) | if (!formats) | ||||
| return AVERROR(ENOMEM); | return AVERROR(ENOMEM); | ||||
| ff_set_common_samplerates(ctx, formats); | |||||
| return 0; | |||||
| return ff_set_common_samplerates(ctx, formats); | |||||
| } | } | ||||
| static int config_output(AVFilterLink *outlink) | static int config_output(AVFilterLink *outlink) | ||||
| @@ -1012,26 +1012,29 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_SAMPLE_FMT_DBL, | AV_SAMPLE_FMT_DBL, | ||||
| AV_SAMPLE_FMT_NONE | AV_SAMPLE_FMT_NONE | ||||
| }; | }; | ||||
| int ret; | |||||
| layouts = ff_all_channel_layouts(); | layouts = ff_all_channel_layouts(); | ||||
| if (!layouts) { | if (!layouts) { | ||||
| return AVERROR(ENOMEM); | 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); | formats = ff_make_format_list(sample_fmts); | ||||
| if (!formats) { | if (!formats) { | ||||
| return AVERROR(ENOMEM); | 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(); | formats = ff_all_samplerates(); | ||||
| if (!formats) { | if (!formats) { | ||||
| return AVERROR(ENOMEM); | return AVERROR(ENOMEM); | ||||
| } | } | ||||
| ff_set_common_samplerates(ctx, formats); | |||||
| return 0; | |||||
| return ff_set_common_samplerates(ctx, formats); | |||||
| } | } | ||||
| static int config_props(AVFilterLink *inlink) | static int config_props(AVFilterLink *inlink) | ||||
| @@ -142,23 +142,26 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_SAMPLE_FMT_DBLP, | AV_SAMPLE_FMT_DBLP, | ||||
| AV_SAMPLE_FMT_NONE | AV_SAMPLE_FMT_NONE | ||||
| }; | }; | ||||
| int ret; | |||||
| layouts = ff_all_channel_layouts(); | layouts = ff_all_channel_layouts(); | ||||
| if (!layouts) | if (!layouts) | ||||
| return AVERROR(ENOMEM); | 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); | formats = ff_make_format_list(sample_fmts); | ||||
| if (!formats) | if (!formats) | ||||
| return AVERROR(ENOMEM); | 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(); | formats = ff_all_samplerates(); | ||||
| if (!formats) | if (!formats) | ||||
| return AVERROR(ENOMEM); | return AVERROR(ENOMEM); | ||||
| ff_set_common_samplerates(ctx, formats); | |||||
| return 0; | |||||
| return ff_set_common_samplerates(ctx, formats); | |||||
| } | } | ||||
| #define BIQUAD_FILTER(name, type, min, max, need_clipping) \ | #define BIQUAD_FILTER(name, type, min, max, need_clipping) \ | ||||
| @@ -106,22 +106,25 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_SAMPLE_FMT_DBL, | AV_SAMPLE_FMT_DBL, | ||||
| AV_SAMPLE_FMT_NONE, | AV_SAMPLE_FMT_NONE, | ||||
| }; | }; | ||||
| int ret; | |||||
| if (ff_add_channel_layout(&layouts, AV_CH_LAYOUT_STEREO) != 0) | if (ff_add_channel_layout(&layouts, AV_CH_LAYOUT_STEREO) != 0) | ||||
| return AVERROR(ENOMEM); | 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); | formats = ff_make_format_list(sample_fmts); | ||||
| if (!formats) | if (!formats) | ||||
| return AVERROR(ENOMEM); | 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(); | formats = ff_all_samplerates(); | ||||
| if (!formats) | if (!formats) | ||||
| return AVERROR(ENOMEM); | return AVERROR(ENOMEM); | ||||
| ff_set_common_samplerates(ctx, formats); | |||||
| return 0; | |||||
| return ff_set_common_samplerates(ctx, formats); | |||||
| } | } | ||||
| static int filter_frame(AVFilterLink *inlink, AVFrame *frame) | static int filter_frame(AVFilterLink *inlink, AVFrame *frame) | ||||
| @@ -107,23 +107,26 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_SAMPLE_FMT_DBLP, | AV_SAMPLE_FMT_DBLP, | ||||
| AV_SAMPLE_FMT_NONE | AV_SAMPLE_FMT_NONE | ||||
| }; | }; | ||||
| int ret; | |||||
| layouts = ff_all_channel_layouts(); | layouts = ff_all_channel_layouts(); | ||||
| if (!layouts) | if (!layouts) | ||||
| return AVERROR(ENOMEM); | 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); | formats = ff_make_format_list(sample_fmts); | ||||
| if (!formats) | if (!formats) | ||||
| return AVERROR(ENOMEM); | 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(); | formats = ff_all_samplerates(); | ||||
| if (!formats) | if (!formats) | ||||
| return AVERROR(ENOMEM); | return AVERROR(ENOMEM); | ||||
| ff_set_common_samplerates(ctx, formats); | |||||
| return 0; | |||||
| return ff_set_common_samplerates(ctx, formats); | |||||
| } | } | ||||
| static void count_items(char *item_str, int *nb_items) | static void count_items(char *item_str, int *nb_items) | ||||
| @@ -59,23 +59,26 @@ static int query_formats(AVFilterContext *ctx) | |||||
| static const enum AVSampleFormat sample_fmts[] = { | static const enum AVSampleFormat sample_fmts[] = { | ||||
| AV_SAMPLE_FMT_S32P, AV_SAMPLE_FMT_NONE | AV_SAMPLE_FMT_S32P, AV_SAMPLE_FMT_NONE | ||||
| }; | }; | ||||
| int ret; | |||||
| layouts = ff_all_channel_layouts(); | layouts = ff_all_channel_layouts(); | ||||
| if (!layouts) | if (!layouts) | ||||
| return AVERROR(ENOMEM); | 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); | formats = ff_make_format_list(sample_fmts); | ||||
| if (!formats) | if (!formats) | ||||
| return AVERROR(ENOMEM); | 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(); | formats = ff_all_samplerates(); | ||||
| if (!formats) | if (!formats) | ||||
| return AVERROR(ENOMEM); | return AVERROR(ENOMEM); | ||||
| ff_set_common_samplerates(ctx, formats); | |||||
| return 0; | |||||
| return ff_set_common_samplerates(ctx, formats); | |||||
| } | } | ||||
| static int filter_frame(AVFilterLink *inlink, AVFrame *in) | static int filter_frame(AVFilterLink *inlink, AVFrame *in) | ||||
| @@ -95,23 +95,26 @@ static int query_formats(AVFilterContext *ctx) | |||||
| static const enum AVSampleFormat sample_fmts[] = { | static const enum AVSampleFormat sample_fmts[] = { | ||||
| AV_SAMPLE_FMT_DBLP, AV_SAMPLE_FMT_NONE | AV_SAMPLE_FMT_DBLP, AV_SAMPLE_FMT_NONE | ||||
| }; | }; | ||||
| int ret; | |||||
| layouts = ff_all_channel_layouts(); | layouts = ff_all_channel_layouts(); | ||||
| if (!layouts) | if (!layouts) | ||||
| return AVERROR(ENOMEM); | 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); | formats = ff_make_format_list(sample_fmts); | ||||
| if (!formats) | if (!formats) | ||||
| return AVERROR(ENOMEM); | 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(); | formats = ff_all_samplerates(); | ||||
| if (!formats) | if (!formats) | ||||
| return AVERROR(ENOMEM); | return AVERROR(ENOMEM); | ||||
| ff_set_common_samplerates(ctx, formats); | |||||
| return 0; | |||||
| return ff_set_common_samplerates(ctx, formats); | |||||
| } | } | ||||
| static int config_input(AVFilterLink *inlink) | static int config_input(AVFilterLink *inlink) | ||||
| @@ -164,23 +164,26 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_SAMPLE_FMT_S16, | AV_SAMPLE_FMT_S16, | ||||
| AV_SAMPLE_FMT_NONE | AV_SAMPLE_FMT_NONE | ||||
| }; | }; | ||||
| int ret; | |||||
| layouts = ff_all_channel_layouts(); | layouts = ff_all_channel_layouts(); | ||||
| if (!layouts) | if (!layouts) | ||||
| return AVERROR(ENOMEM); | 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); | formats = ff_make_format_list(sample_fmts); | ||||
| if (!formats) | if (!formats) | ||||
| return AVERROR(ENOMEM); | 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(); | formats = ff_all_samplerates(); | ||||
| if (!formats) | if (!formats) | ||||
| return AVERROR(ENOMEM); | return AVERROR(ENOMEM); | ||||
| ff_set_common_samplerates(ctx, formats); | |||||
| return 0; | |||||
| return ff_set_common_samplerates(ctx, formats); | |||||
| } | } | ||||
| static const AVFilterPad silencedetect_inputs[] = { | static const AVFilterPad silencedetect_inputs[] = { | ||||
| @@ -418,23 +418,26 @@ static int query_formats(AVFilterContext *ctx) | |||||
| static const enum AVSampleFormat sample_fmts[] = { | static const enum AVSampleFormat sample_fmts[] = { | ||||
| AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_NONE | AV_SAMPLE_FMT_DBL, AV_SAMPLE_FMT_NONE | ||||
| }; | }; | ||||
| int ret; | |||||
| layouts = ff_all_channel_layouts(); | layouts = ff_all_channel_layouts(); | ||||
| if (!layouts) | if (!layouts) | ||||
| return AVERROR(ENOMEM); | 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); | formats = ff_make_format_list(sample_fmts); | ||||
| if (!formats) | if (!formats) | ||||
| return AVERROR(ENOMEM); | 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(); | formats = ff_all_samplerates(); | ||||
| if (!formats) | if (!formats) | ||||
| return AVERROR(ENOMEM); | return AVERROR(ENOMEM); | ||||
| ff_set_common_samplerates(ctx, formats); | |||||
| return 0; | |||||
| return ff_set_common_samplerates(ctx, formats); | |||||
| } | } | ||||
| static av_cold void uninit(AVFilterContext *ctx) | static av_cold void uninit(AVFilterContext *ctx) | ||||
| @@ -153,23 +153,26 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_SAMPLE_FMT_NONE | AV_SAMPLE_FMT_NONE | ||||
| } | } | ||||
| }; | }; | ||||
| int ret; | |||||
| layouts = ff_all_channel_counts(); | layouts = ff_all_channel_counts(); | ||||
| if (!layouts) | if (!layouts) | ||||
| return AVERROR(ENOMEM); | 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[vol->precision]); | formats = ff_make_format_list(sample_fmts[vol->precision]); | ||||
| if (!formats) | if (!formats) | ||||
| return AVERROR(ENOMEM); | 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(); | formats = ff_all_samplerates(); | ||||
| if (!formats) | if (!formats) | ||||
| return AVERROR(ENOMEM); | return AVERROR(ENOMEM); | ||||
| ff_set_common_samplerates(ctx, formats); | |||||
| return 0; | |||||
| return ff_set_common_samplerates(ctx, formats); | |||||
| } | } | ||||
| static inline void scale_samples_u8(uint8_t *dst, const uint8_t *src, | static inline void scale_samples_u8(uint8_t *dst, const uint8_t *src, | ||||
| @@ -44,9 +44,7 @@ static int query_formats(AVFilterContext *ctx) | |||||
| if (!(formats = ff_make_format_list(sample_fmts))) | if (!(formats = ff_make_format_list(sample_fmts))) | ||||
| return AVERROR(ENOMEM); | return AVERROR(ENOMEM); | ||||
| ff_set_common_formats(ctx, formats); | |||||
| return 0; | |||||
| return ff_set_common_formats(ctx, formats); | |||||
| } | } | ||||
| static int filter_frame(AVFilterLink *inlink, AVFrame *samples) | static int filter_frame(AVFilterLink *inlink, AVFrame *samples) | ||||
| @@ -153,11 +153,28 @@ static av_cold int query_formats(AVFilterContext *ctx) | |||||
| int sample_rates[] = { sine->sample_rate, -1 }; | int sample_rates[] = { sine->sample_rate, -1 }; | ||||
| static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_S16, | static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_S16, | ||||
| AV_SAMPLE_FMT_NONE }; | AV_SAMPLE_FMT_NONE }; | ||||
| AVFilterFormats *formats; | |||||
| AVFilterChannelLayouts *layouts; | |||||
| int ret; | |||||
| ff_set_common_formats (ctx, ff_make_format_list(sample_fmts)); | |||||
| ff_set_common_channel_layouts(ctx, avfilter_make_format64_list(chlayouts)); | |||||
| ff_set_common_samplerates(ctx, ff_make_format_list(sample_rates)); | |||||
| return 0; | |||||
| formats = ff_make_format_list(sample_fmts); | |||||
| if (!formats) | |||||
| return AVERROR(ENOMEM); | |||||
| ret = ff_set_common_formats (ctx, formats); | |||||
| if (ret < 0) | |||||
| return ret; | |||||
| layouts = avfilter_make_format64_list(chlayouts); | |||||
| if (!layouts) | |||||
| return AVERROR(ENOMEM); | |||||
| ret = ff_set_common_channel_layouts(ctx, layouts); | |||||
| if (ret < 0) | |||||
| return ret; | |||||
| formats = ff_make_format_list(sample_rates); | |||||
| if (!formats) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_samplerates(ctx, formats); | |||||
| } | } | ||||
| static av_cold int config_props(AVFilterLink *outlink) | static av_cold int config_props(AVFilterLink *outlink) | ||||
| @@ -56,8 +56,10 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_NONE, | AV_PIX_FMT_NONE, | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| #define SET_META(key, value) \ | #define SET_META(key, value) \ | ||||
| @@ -80,8 +80,10 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_NONE | AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static int config_input(AVFilterLink *inlink) | static int config_input(AVFilterLink *inlink) | ||||
| @@ -54,8 +54,10 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_NONE | AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| #define SET_META(key, format, value) \ | #define SET_META(key, format, value) \ | ||||
| @@ -369,8 +369,10 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE | AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static av_cold void uninit(AVFilterContext *ctx) | static av_cold void uninit(AVFilterContext *ctx) | ||||
| @@ -128,8 +128,7 @@ static int query_formats(AVFilterContext *ctx) | |||||
| ff_add_format(&formats, fmt); | ff_add_format(&formats, fmt); | ||||
| } | } | ||||
| ff_set_common_formats(ctx, formats); | |||||
| return 0; | |||||
| return ff_set_common_formats(ctx, formats); | |||||
| } | } | ||||
| static int config_input(AVFilterLink *inlink) | static int config_input(AVFilterLink *inlink) | ||||
| @@ -81,8 +81,10 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_NONE | AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static int config_output(AVFilterLink *outlink) | static int config_output(AVFilterLink *outlink) | ||||
| @@ -84,8 +84,10 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_NONE | AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static int config_input(AVFilterLink *inlink) | static int config_input(AVFilterLink *inlink) | ||||
| @@ -102,8 +102,7 @@ static int query_formats(AVFilterContext *ctx) | |||||
| ff_add_format(&formats, fmt); | ff_add_format(&formats, fmt); | ||||
| } | } | ||||
| ff_set_common_formats(ctx, formats); | |||||
| return 0; | |||||
| return ff_set_common_formats(ctx, formats); | |||||
| } | } | ||||
| static av_cold void uninit(AVFilterContext *ctx) | static av_cold void uninit(AVFilterContext *ctx) | ||||
| @@ -62,8 +62,10 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_NONE | AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static int checkline(void *ctx, const unsigned char *src, int stride, int len, int bpp) | static int checkline(void *ctx, const unsigned char *src, int stride, int len, int bpp) | ||||
| @@ -126,8 +126,7 @@ static int query_formats(AVFilterContext *ctx) | |||||
| ff_add_format(&pix_fmts, fmt); | ff_add_format(&pix_fmts, fmt); | ||||
| } | } | ||||
| ff_set_common_formats(ctx, pix_fmts); | |||||
| return 0; | |||||
| return ff_set_common_formats(ctx, pix_fmts); | |||||
| } | } | ||||
| static int config_input(AVFilterLink *inlink) | static int config_input(AVFilterLink *inlink) | ||||
| @@ -682,8 +682,7 @@ static av_cold int init(AVFilterContext *ctx) | |||||
| static int query_formats(AVFilterContext *ctx) | static int query_formats(AVFilterContext *ctx) | ||||
| { | { | ||||
| ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0)); | |||||
| return 0; | |||||
| return ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0)); | |||||
| } | } | ||||
| static int glyph_enu_free(void *opaque, void *elem) | static int glyph_enu_free(void *opaque, void *elem) | ||||
| @@ -115,12 +115,15 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA, | AV_PIX_FMT_RGBA, AV_PIX_FMT_BGRA, | ||||
| AV_PIX_FMT_NONE | AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| AVFilterFormats *fmts_list; | |||||
| if (s->black_fade) | if (s->black_fade) | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| fmts_list = ff_make_format_list(pix_fmts); | |||||
| else | else | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts_rgb)); | |||||
| return 0; | |||||
| fmts_list = ff_make_format_list(pix_fmts_rgb); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| const static enum AVPixelFormat studio_level_pix_fmts[] = { | const static enum AVPixelFormat studio_level_pix_fmts[] = { | ||||
| @@ -307,9 +307,10 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_NONE | AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pixel_fmts_fftfilt)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pixel_fmts_fftfilt); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static const AVFilterPad fftfilt_inputs[] = { | static const AVFilterPad fftfilt_inputs[] = { | ||||
| @@ -134,8 +134,7 @@ static int query_formats(AVFilterContext *ctx) | |||||
| if (!formats) | if (!formats) | ||||
| return AVERROR(ENOMEM); | return AVERROR(ENOMEM); | ||||
| ff_set_common_formats(ctx, formats); | |||||
| return 0; | |||||
| return ff_set_common_formats(ctx, formats); | |||||
| } | } | ||||
| @@ -61,8 +61,10 @@ static const enum AVPixelFormat formats_supported[] = { | |||||
| static int query_formats(AVFilterContext *ctx) | static int query_formats(AVFilterContext *ctx) | ||||
| { | { | ||||
| // this will ensure that formats are the same on all pads | // this will ensure that formats are the same on all pads | ||||
| ff_set_common_formats(ctx, ff_make_format_list(formats_supported)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(formats_supported); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static av_cold void framepack_uninit(AVFilterContext *ctx) | static av_cold void framepack_uninit(AVFilterContext *ctx) | ||||
| @@ -385,8 +385,7 @@ static int query_formats(AVFilterContext *ctx) | |||||
| if (!formats) | if (!formats) | ||||
| return AVERROR(ENOMEM); | return AVERROR(ENOMEM); | ||||
| ff_set_common_formats(ctx, formats); | |||||
| return 0; | |||||
| return ff_set_common_formats(ctx, formats); | |||||
| } | } | ||||
| static int filter_frame(AVFilterLink *inlink, AVFrame *in) | static int filter_frame(AVFilterLink *inlink, AVFrame *in) | ||||
| @@ -501,8 +501,11 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_GBRP, AV_PIX_FMT_GRAY8, | AV_PIX_FMT_GBRP, AV_PIX_FMT_GRAY8, | ||||
| AV_PIX_FMT_NONE | AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static int config_input(AVFilterLink *inlink) | static int config_input(AVFilterLink *inlink) | ||||
| @@ -176,11 +176,15 @@ static int geq_query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, | AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, | ||||
| AV_PIX_FMT_NONE | AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| AVFilterFormats *fmts_list; | |||||
| if (geq->is_rgb) { | if (geq->is_rgb) { | ||||
| ff_set_common_formats(ctx, ff_make_format_list(rgb_pix_fmts)); | |||||
| fmts_list = ff_make_format_list(rgb_pix_fmts); | |||||
| } else | } else | ||||
| ff_set_common_formats(ctx, ff_make_format_list(yuv_pix_fmts)); | |||||
| return 0; | |||||
| fmts_list = ff_make_format_list(yuv_pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static int geq_config_props(AVFilterLink *inlink) | static int geq_config_props(AVFilterLink *inlink) | ||||
| @@ -55,8 +55,7 @@ static int query_formats(AVFilterContext *ctx) | |||||
| ff_add_format(&pix_fmts, fmt); | ff_add_format(&pix_fmts, fmt); | ||||
| } | } | ||||
| ff_set_common_formats(ctx, pix_fmts); | |||||
| return 0; | |||||
| return ff_set_common_formats(ctx, pix_fmts); | |||||
| } | } | ||||
| static int config_props(AVFilterLink *inlink) | static int config_props(AVFilterLink *inlink) | ||||
| @@ -105,6 +105,7 @@ static int query_formats(AVFilterContext *ctx) | |||||
| { | { | ||||
| HistogramContext *h = ctx->priv; | HistogramContext *h = ctx->priv; | ||||
| const enum AVPixelFormat *pix_fmts; | const enum AVPixelFormat *pix_fmts; | ||||
| AVFilterFormats *fmts_list; | |||||
| switch (h->mode) { | switch (h->mode) { | ||||
| case MODE_WAVEFORM: | case MODE_WAVEFORM: | ||||
| @@ -121,9 +122,10 @@ static int query_formats(AVFilterContext *ctx) | |||||
| av_assert0(0); | av_assert0(0); | ||||
| } | } | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static const uint8_t black_yuva_color[4] = { 0, 127, 127, 255 }; | static const uint8_t black_yuva_color[4] = { 0, 127, 127, 255 }; | ||||
| @@ -92,8 +92,7 @@ static int query_formats(AVFilterContext *ctx) | |||||
| ff_add_format(&formats, fmt); | ff_add_format(&formats, fmt); | ||||
| } | } | ||||
| ff_set_common_formats(ctx, formats); | |||||
| return 0; | |||||
| return ff_set_common_formats(ctx, formats); | |||||
| } | } | ||||
| static int config_input(AVFilterLink *inlink) | static int config_input(AVFilterLink *inlink) | ||||
| @@ -76,8 +76,10 @@ static const enum AVPixelFormat formats_supported[] = { | |||||
| static int query_formats(AVFilterContext *ctx) | static int query_formats(AVFilterContext *ctx) | ||||
| { | { | ||||
| ff_set_common_formats(ctx, ff_make_format_list(formats_supported)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(formats_supported); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static av_cold void uninit(AVFilterContext *ctx) | static av_cold void uninit(AVFilterContext *ctx) | ||||
| @@ -78,9 +78,10 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_NONE | AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static int config_props(AVFilterLink *inlink) | static int config_props(AVFilterLink *inlink) | ||||
| @@ -141,8 +141,7 @@ static int query_formats(AVFilterContext *ctx) | |||||
| ff_add_format(&formats, fmt); | ff_add_format(&formats, fmt); | ||||
| } | } | ||||
| ff_set_common_formats(ctx, formats); | |||||
| return 0; | |||||
| return ff_set_common_formats(ctx, formats); | |||||
| } | } | ||||
| static int config_input(AVFilterLink *inlink) | static int config_input(AVFilterLink *inlink) | ||||
| @@ -73,8 +73,7 @@ enum var_name { | |||||
| static int query_formats(AVFilterContext *ctx) | static int query_formats(AVFilterContext *ctx) | ||||
| { | { | ||||
| ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0)); | |||||
| return 0; | |||||
| return ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0)); | |||||
| } | } | ||||
| typedef struct PadContext { | typedef struct PadContext { | ||||
| @@ -93,8 +93,10 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE | AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static inline double get_coeff(double d) | static inline double get_coeff(double d) | ||||
| @@ -77,8 +77,10 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE | AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static int config_input(AVFilterLink *inlink) | static int config_input(AVFilterLink *inlink) | ||||
| @@ -85,8 +85,11 @@ static int pp_query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_GRAY8, | AV_PIX_FMT_GRAY8, | ||||
| AV_PIX_FMT_NONE | AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static int pp_config_props(AVFilterLink *inlink) | static int pp_config_props(AVFilterLink *inlink) | ||||
| @@ -274,8 +274,11 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_GBRP, | AV_PIX_FMT_GBRP, | ||||
| AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE | AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static int config_input(AVFilterLink *inlink) | static int config_input(AVFilterLink *inlink) | ||||
| @@ -232,8 +232,10 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_NONE | AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static int config_input_ref(AVFilterLink *inlink) | static int config_input_ref(AVFilterLink *inlink) | ||||
| @@ -63,8 +63,11 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_YUVJ411P, AV_PIX_FMT_GRAY8, | AV_PIX_FMT_YUVJ411P, AV_PIX_FMT_GRAY8, | ||||
| AV_PIX_FMT_NONE | AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| #define ABS(a) (((a) ^ ((a) >> 31)) - ((a) >> 31)) | #define ABS(a) (((a) ^ ((a) >> 31)) - ((a) >> 31)) | ||||
| @@ -206,8 +206,10 @@ static void convert_mask_to_strength_mask(uint8_t *data, int linesize, | |||||
| static int query_formats(AVFilterContext *ctx) | static int query_formats(AVFilterContext *ctx) | ||||
| { | { | ||||
| static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }; | static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static int load_mask(uint8_t **mask, int *w, int *h, | static int load_mask(uint8_t **mask, int *w, int *h, | ||||
| @@ -50,9 +50,10 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_NONE | AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pixel_fmts_eq)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pixel_fmts_eq); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static int config_input(AVFilterLink *inlink) | static int config_input(AVFilterLink *inlink) | ||||
| @@ -145,8 +145,10 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_NONE | AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static double get_rotated_w(void *opaque, double angle) | static double get_rotated_w(void *opaque, double angle) | ||||
| @@ -65,9 +65,10 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_YUV411P, | AV_PIX_FMT_YUV411P, | ||||
| AV_PIX_FMT_NONE | AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| #define RADIUS_MIN 0.1 | #define RADIUS_MIN 0.1 | ||||
| @@ -118,8 +118,10 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_NONE | AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static AVFrame *alloc_frame(enum AVPixelFormat pixfmt, int w, int h) | static AVFrame *alloc_frame(enum AVPixelFormat pixfmt, int w, int h) | ||||
| @@ -124,9 +124,10 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_NONE | AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static int alloc_sws_context(FilterParam *f, int width, int height, unsigned int flags) | static int alloc_sws_context(FilterParam *f, int width, int height, unsigned int flags) | ||||
| @@ -319,8 +319,11 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_GBRP10, | AV_PIX_FMT_GBRP10, | ||||
| AV_PIX_FMT_NONE | AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static int config_input(AVFilterLink *inlink) | static int config_input(AVFilterLink *inlink) | ||||
| @@ -256,6 +256,7 @@ static int query_formats(AVFilterContext *ctx) | |||||
| { | { | ||||
| Stereo3DContext *s = ctx->priv; | Stereo3DContext *s = ctx->priv; | ||||
| const enum AVPixelFormat *pix_fmts; | const enum AVPixelFormat *pix_fmts; | ||||
| AVFilterFormats *fmts_list; | |||||
| switch (s->out.format) { | switch (s->out.format) { | ||||
| case ANAGLYPH_GM_COLOR: | case ANAGLYPH_GM_COLOR: | ||||
| @@ -278,9 +279,10 @@ static int query_formats(AVFilterContext *ctx) | |||||
| pix_fmts = other_pix_fmts; | pix_fmts = other_pix_fmts; | ||||
| } | } | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static int config_output(AVFilterLink *outlink) | static int config_output(AVFilterLink *outlink) | ||||
| @@ -129,8 +129,7 @@ static av_cold void uninit(AVFilterContext *ctx) | |||||
| static int query_formats(AVFilterContext *ctx) | static int query_formats(AVFilterContext *ctx) | ||||
| { | { | ||||
| ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0)); | |||||
| return 0; | |||||
| return ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0)); | |||||
| } | } | ||||
| static int config_input(AVFilterLink *inlink) | static int config_input(AVFilterLink *inlink) | ||||
| @@ -241,8 +241,10 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_NONE | AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static int config_input(AVFilterLink *inlink) | static int config_input(AVFilterLink *inlink) | ||||
| @@ -79,8 +79,7 @@ static int query_formats(AVFilterContext *ctx) | |||||
| ff_add_format(&formats, fmt); | ff_add_format(&formats, fmt); | ||||
| } | } | ||||
| ff_set_common_formats(ctx, formats); | |||||
| return 0; | |||||
| return ff_set_common_formats(ctx, formats); | |||||
| } | } | ||||
| static const AVFilterPad swapuv_inputs[] = { | static const AVFilterPad swapuv_inputs[] = { | ||||
| @@ -112,8 +112,7 @@ static int query_formats(AVFilterContext *ctx) | |||||
| ff_add_format(&pix_fmts, fmt); | ff_add_format(&pix_fmts, fmt); | ||||
| } | } | ||||
| ff_set_common_formats(ctx, pix_fmts); | |||||
| return 0; | |||||
| return ff_set_common_formats(ctx, pix_fmts); | |||||
| } | } | ||||
| static int config_input(AVFilterLink *inlink) | static int config_input(AVFilterLink *inlink) | ||||
| @@ -203,8 +203,10 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, | AV_PIX_FMT_RGB24, AV_PIX_FMT_BGR24, | ||||
| AV_PIX_FMT_NONE | AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static const AVFilterPad thumbnail_inputs[] = { | static const AVFilterPad thumbnail_inputs[] = { | ||||
| @@ -87,8 +87,7 @@ static av_cold int init(AVFilterContext *ctx) | |||||
| static int query_formats(AVFilterContext *ctx) | static int query_formats(AVFilterContext *ctx) | ||||
| { | { | ||||
| ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0)); | |||||
| return 0; | |||||
| return ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0)); | |||||
| } | } | ||||
| static int config_props(AVFilterLink *outlink) | static int config_props(AVFilterLink *outlink) | ||||
| @@ -81,8 +81,10 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_NONE | AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static void lowpass_line_c(uint8_t *dstp, ptrdiff_t width, const uint8_t *srcp, | static void lowpass_line_c(uint8_t *dstp, ptrdiff_t width, const uint8_t *srcp, | ||||
| @@ -75,8 +75,7 @@ static int query_formats(AVFilterContext *ctx) | |||||
| } | } | ||||
| ff_set_common_formats(ctx, pix_fmts); | |||||
| return 0; | |||||
| return ff_set_common_formats(ctx, pix_fmts); | |||||
| } | } | ||||
| static int config_props_output(AVFilterLink *outlink) | static int config_props_output(AVFilterLink *outlink) | ||||
| @@ -163,9 +163,10 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P, AV_PIX_FMT_NONE | AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P, AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static int init_filter_param(AVFilterContext *ctx, UnsharpFilterParam *fp, const char *effect_type, int width) | static int init_filter_param(AVFilterContext *ctx, UnsharpFilterParam *fp, const char *effect_type, int width) | ||||
| @@ -293,8 +293,11 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_GRAY8, | AV_PIX_FMT_GRAY8, | ||||
| AV_PIX_FMT_NONE | AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static int config_input(AVFilterLink *inlink) | static int config_input(AVFilterLink *inlink) | ||||
| @@ -93,8 +93,10 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_NONE | AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static int config_input(AVFilterLink *inlink) | static int config_input(AVFilterLink *inlink) | ||||
| @@ -132,8 +132,10 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_NONE | AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| @@ -136,8 +136,10 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_GRAY8, | AV_PIX_FMT_GRAY8, | ||||
| AV_PIX_FMT_NONE | AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static double get_natural_factor(const VignetteContext *s, int x, int y) | static double get_natural_factor(const VignetteContext *s, int x, int y) | ||||
| @@ -74,9 +74,10 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_NONE | AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static int config_input(AVFilterLink *inlink) | static int config_input(AVFilterLink *inlink) | ||||
| @@ -342,8 +342,10 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_0RGB32, AV_PIX_FMT_NONE, | AV_PIX_FMT_0RGB32, AV_PIX_FMT_NONE, | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static int filter_frame(AVFilterLink *inlink, AVFrame *in) | static int filter_frame(AVFilterLink *inlink, AVFrame *in) | ||||
| @@ -461,9 +461,10 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_NONE | AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static int config_props(AVFilterLink *link) | static int config_props(AVFilterLink *link) | ||||
| @@ -264,9 +264,10 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_NONE | AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static av_cold void uninit(AVFilterContext *ctx) | static av_cold void uninit(AVFilterContext *ctx) | ||||
| @@ -310,8 +310,10 @@ static int request_frame(AVFilterLink *outlink) | |||||
| static int query_formats(AVFilterContext *ctx) | static int query_formats(AVFilterContext *ctx) | ||||
| { | { | ||||
| static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_MONOBLACK, AV_PIX_FMT_NONE }; | static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_MONOBLACK, AV_PIX_FMT_NONE }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static const AVFilterPad cellauto_outputs[] = { | static const AVFilterPad cellauto_outputs[] = { | ||||
| @@ -423,7 +423,11 @@ static int query_formats(AVFilterContext *ctx) | |||||
| pix_fmts[0] = AV_PIX_FMT_MONOBLACK; | pix_fmts[0] = AV_PIX_FMT_MONOBLACK; | ||||
| life->draw = fill_picture_monoblack; | life->draw = fill_picture_monoblack; | ||||
| } | } | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| ff_set_common_formats(ctx, fmts_list); | |||||
| return 0; | return 0; | ||||
| } | } | ||||
| @@ -153,8 +153,10 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_NONE | AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static int config_props(AVFilterLink *inlink) | static int config_props(AVFilterLink *inlink) | ||||
| @@ -291,8 +291,10 @@ static int query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE | AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static int request_frame(AVFilterLink *outlink) | static int request_frame(AVFilterLink *outlink) | ||||
| @@ -202,8 +202,7 @@ static av_cold int color_init(AVFilterContext *ctx) | |||||
| static int color_query_formats(AVFilterContext *ctx) | static int color_query_formats(AVFilterContext *ctx) | ||||
| { | { | ||||
| ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0)); | |||||
| return 0; | |||||
| return ff_set_common_formats(ctx, ff_draw_supported_pixel_formats(0)); | |||||
| } | } | ||||
| static int color_config_props(AVFilterLink *inlink) | static int color_config_props(AVFilterLink *inlink) | ||||
| @@ -366,8 +365,11 @@ static int haldclutsrc_query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_RGBA64, AV_PIX_FMT_BGRA64, | AV_PIX_FMT_RGBA64, AV_PIX_FMT_BGRA64, | ||||
| AV_PIX_FMT_NONE, | AV_PIX_FMT_NONE, | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static int haldclutsrc_config_props(AVFilterLink *outlink) | static int haldclutsrc_config_props(AVFilterLink *outlink) | ||||
| @@ -646,8 +648,11 @@ static int test_query_formats(AVFilterContext *ctx) | |||||
| static const enum AVPixelFormat pix_fmts[] = { | static const enum AVPixelFormat pix_fmts[] = { | ||||
| AV_PIX_FMT_RGB24, AV_PIX_FMT_NONE | AV_PIX_FMT_RGB24, AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static const AVFilterPad avfilter_vsrc_testsrc_outputs[] = { | static const AVFilterPad avfilter_vsrc_testsrc_outputs[] = { | ||||
| @@ -754,8 +759,11 @@ static int rgbtest_query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_RGB555, AV_PIX_FMT_BGR555, | AV_PIX_FMT_RGB555, AV_PIX_FMT_BGR555, | ||||
| AV_PIX_FMT_NONE | AV_PIX_FMT_NONE | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static int rgbtest_config_props(AVFilterLink *outlink) | static int rgbtest_config_props(AVFilterLink *outlink) | ||||
| @@ -883,8 +891,11 @@ static int smptebars_query_formats(AVFilterContext *ctx) | |||||
| AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P, | AV_PIX_FMT_YUV410P, AV_PIX_FMT_YUV411P, | ||||
| AV_PIX_FMT_NONE, | AV_PIX_FMT_NONE, | ||||
| }; | }; | ||||
| ff_set_common_formats(ctx, ff_make_format_list(pix_fmts)); | |||||
| return 0; | |||||
| AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts); | |||||
| if (!fmts_list) | |||||
| return AVERROR(ENOMEM); | |||||
| return ff_set_common_formats(ctx, fmts_list); | |||||
| } | } | ||||
| static const AVFilterPad smptebars_outputs[] = { | static const AVFilterPad smptebars_outputs[] = { | ||||