This is an automated email from the git hooks/post-receive script.
Git pushed a commit to branch master
in repository ffmpeg.
The following commit(s) were added to refs/heads/master by this push:
new ec8e0b3592 libavfilter: Use type-safe format negotiation functions
with enum parameters
ec8e0b3592 is described below
commit ec8e0b3592ef164f49d4c99823e9bf876d36da9a
Author: niyinghao <[email protected]>
AuthorDate: Thu Jan 22 19:30:36 2026 +0800
Commit: Zhao Zhili <[email protected]>
CommitDate: Sat Jan 24 08:11:19 2026 +0000
libavfilter: Use type-safe format negotiation functions with enum parameters
Replace generic format functions with type-safe variants to prevent
undefined
behavior with -fshort-enums compiler flag.
- 44/20 filters: ff_set_common_formats_from_list2 ->
ff_set_*_formats_from_list2 (sample/pixel)
- 16/41 filters: ff_make_format_list → ff_make_*_format_list (sample/pixel)
Signed-off-by: niyinghao <[email protected]>
---
libavfilter/aeval.c | 4 ++--
libavfilter/af_aap.c | 2 +-
libavfilter/af_acrossover.c | 2 +-
libavfilter/af_adynamicequalizer.c | 2 +-
libavfilter/af_afir.c | 2 +-
libavfilter/af_aformat.c | 2 +-
libavfilter/af_agate.c | 2 +-
libavfilter/af_aiir.c | 4 ++--
libavfilter/af_amerge.c | 2 +-
libavfilter/af_anequalizer.c | 4 ++--
libavfilter/af_anlms.c | 2 +-
libavfilter/af_apulsator.c | 2 +-
libavfilter/af_aresample.c | 4 ++--
libavfilter/af_arls.c | 2 +-
libavfilter/af_arnndn.c | 2 +-
libavfilter/af_asr.c | 2 +-
libavfilter/af_biquads.c | 2 +-
libavfilter/af_bs2b.c | 2 +-
libavfilter/af_crossfeed.c | 2 +-
libavfilter/af_dialoguenhance.c | 2 +-
libavfilter/af_earwax.c | 2 +-
libavfilter/af_extrastereo.c | 2 +-
libavfilter/af_haas.c | 2 +-
libavfilter/af_hdcd.c | 4 ++--
libavfilter/af_headphone.c | 2 +-
libavfilter/af_ladspa.c | 2 +-
libavfilter/af_loudnorm.c | 2 +-
libavfilter/af_lv2.c | 2 +-
libavfilter/af_replaygain.c | 2 +-
libavfilter/af_sidechaincompress.c | 2 +-
libavfilter/af_sofalizer.c | 2 +-
libavfilter/af_stereotools.c | 2 +-
libavfilter/af_stereowiden.c | 2 +-
libavfilter/af_surround.c | 2 +-
libavfilter/af_virtualbass.c | 2 +-
libavfilter/af_volume.c | 2 +-
libavfilter/af_whisper.c | 2 +-
libavfilter/asrc_afdelaysrc.c | 2 +-
libavfilter/asrc_afirsrc.c | 2 +-
libavfilter/asrc_anoisesrc.c | 2 +-
libavfilter/asrc_flite.c | 2 +-
libavfilter/asrc_hilbert.c | 2 +-
libavfilter/asrc_sinc.c | 2 +-
libavfilter/asrc_sine.c | 2 +-
libavfilter/avf_a3dscope.c | 4 ++--
libavfilter/avf_abitscope.c | 4 ++--
libavfilter/avf_ahistogram.c | 4 ++--
libavfilter/avf_aphasemeter.c | 4 ++--
libavfilter/avf_avectorscope.c | 4 ++--
libavfilter/avf_showcqt.c | 4 ++--
libavfilter/avf_showcwt.c | 4 ++--
libavfilter/avf_showfreqs.c | 4 ++--
libavfilter/avf_showspatial.c | 4 ++--
libavfilter/avf_showspectrum.c | 4 ++--
libavfilter/avf_showvolume.c | 4 ++--
libavfilter/avf_showwaves.c | 4 ++--
libavfilter/buffersink.c | 4 ++--
libavfilter/f_drawgraph.c | 2 +-
libavfilter/f_ebur128.c | 4 ++--
libavfilter/f_graphmonitor.c | 2 +-
libavfilter/f_select.c | 2 +-
libavfilter/src_avsynctest.c | 2 +-
libavfilter/vaapi_vpp.c | 2 +-
libavfilter/vaf_spectrumsynth.c | 6 +++---
libavfilter/vf_alphamerge.c | 4 ++--
libavfilter/vf_amf_common.c | 4 ++--
libavfilter/vf_blackdetect.c | 4 ++--
libavfilter/vf_ciescope.c | 4 ++--
libavfilter/vf_colorspace.c | 2 +-
libavfilter/vf_deband.c | 2 +-
libavfilter/vf_edgedetect.c | 2 +-
libavfilter/vf_elbg.c | 6 +++---
libavfilter/vf_extractplanes.c | 4 ++--
libavfilter/vf_fade.c | 2 +-
libavfilter/vf_fieldmatch.c | 4 ++--
libavfilter/vf_frei0r.c | 2 +-
libavfilter/vf_geq.c | 2 +-
libavfilter/vf_histogram.c | 4 ++--
libavfilter/vf_hwupload.c | 4 ++--
libavfilter/vf_hwupload_cuda.c | 4 ++--
libavfilter/vf_lut.c | 2 +-
libavfilter/vf_lut2.c | 6 +++---
libavfilter/vf_overlay.c | 6 +++---
libavfilter/vf_overlay_qsv.c | 4 ++--
libavfilter/vf_palettegen.c | 4 ++--
libavfilter/vf_paletteuse.c | 6 +++---
libavfilter/vf_premultiply.c | 2 +-
libavfilter/vf_remap.c | 4 ++--
libavfilter/vf_showpalette.c | 4 ++--
libavfilter/vf_stereo3d.c | 2 +-
libavfilter/vf_thumbnail.c | 2 +-
libavfilter/vf_v360.c | 2 +-
libavfilter/vf_vectorscope.c | 4 ++--
libavfilter/vf_vpp_qsv.c | 4 ++--
libavfilter/vf_waveform.c | 4 ++--
libavfilter/vf_zscale.c | 4 ++--
libavfilter/vsrc_life.c | 2 +-
libavfilter/vsrc_perlin.c | 2 +-
98 files changed, 144 insertions(+), 144 deletions(-)
diff --git a/libavfilter/aeval.c b/libavfilter/aeval.c
index 03ecb4e5bb..baea5886fc 100644
--- a/libavfilter/aeval.c
+++ b/libavfilter/aeval.c
@@ -253,7 +253,7 @@ static int query_formats(const AVFilterContext *ctx,
int sample_rates[] = { eval->sample_rate, -1 };
int ret;
- ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, sample_fmts);
+ ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out, sample_fmts);
if (ret < 0)
return ret;
@@ -372,7 +372,7 @@ static int aeval_query_formats(const AVFilterContext *ctx,
return ret;
}
- if ((ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out,
sample_fmts)) < 0)
+ if ((ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out,
sample_fmts)) < 0)
return ret;
return 0;
diff --git a/libavfilter/af_aap.c b/libavfilter/af_aap.c
index 8d3209a1ef..d23e5cdab4 100644
--- a/libavfilter/af_aap.c
+++ b/libavfilter/af_aap.c
@@ -107,7 +107,7 @@ static int query_formats(const AVFilterContext *ctx,
};
int ret;
- if ((ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out,
+ if ((ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out,
sample_fmts[s->precision])) <
0)
return ret;
diff --git a/libavfilter/af_acrossover.c b/libavfilter/af_acrossover.c
index e24bf9eb73..fedf281d58 100644
--- a/libavfilter/af_acrossover.c
+++ b/libavfilter/af_acrossover.c
@@ -138,7 +138,7 @@ static int query_formats(const AVFilterContext *ctx,
default:
break;
}
- ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out,
sample_fmts_list);
+ ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out,
sample_fmts_list);
if (ret < 0)
return ret;
diff --git a/libavfilter/af_adynamicequalizer.c
b/libavfilter/af_adynamicequalizer.c
index 6043623f46..44db821b15 100644
--- a/libavfilter/af_adynamicequalizer.c
+++ b/libavfilter/af_adynamicequalizer.c
@@ -122,7 +122,7 @@ static int query_formats(const AVFilterContext *ctx,
};
int ret;
- if ((ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out,
+ if ((ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out,
sample_fmts[s->precision])) <
0)
return ret;
diff --git a/libavfilter/af_afir.c b/libavfilter/af_afir.c
index aff837d9bf..fa6b063e44 100644
--- a/libavfilter/af_afir.c
+++ b/libavfilter/af_afir.c
@@ -569,7 +569,7 @@ static int query_formats(const AVFilterContext *ctx,
}
}
- if ((ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out,
+ if ((ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out,
sample_fmts[s->precision])) <
0)
return ret;
diff --git a/libavfilter/af_aformat.c b/libavfilter/af_aformat.c
index 2806eac963..ce54e045ef 100644
--- a/libavfilter/af_aformat.c
+++ b/libavfilter/af_aformat.c
@@ -112,7 +112,7 @@ static int query_formats(const AVFilterContext *ctx,
int ret;
if (s->nb_formats) {
- ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out,
s->formats);
+ ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out,
s->formats);
if (ret < 0)
return ret;
}
diff --git a/libavfilter/af_agate.c b/libavfilter/af_agate.c
index 3f8a7b3202..abac821e8c 100644
--- a/libavfilter/af_agate.c
+++ b/libavfilter/af_agate.c
@@ -328,7 +328,7 @@ static int scquery_formats(const AVFilterContext *ctx,
if (ret < 0)
return ret;
- if ((ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out,
sample_fmts)) < 0)
+ if ((ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out,
sample_fmts)) < 0)
return ret;
return 0;
diff --git a/libavfilter/af_aiir.c b/libavfilter/af_aiir.c
index f18b6e9286..2111a08c51 100644
--- a/libavfilter/af_aiir.c
+++ b/libavfilter/af_aiir.c
@@ -95,13 +95,13 @@ static int query_formats(const AVFilterContext *ctx,
int ret;
if (s->response) {
- formats = ff_make_format_list(pix_fmts);
+ formats = ff_make_pixel_format_list(pix_fmts);
if ((ret = ff_formats_ref(formats, &cfg_out[1]->formats)) < 0)
return ret;
}
sample_fmts[0] = s->sample_format;
- ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, sample_fmts);
+ ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out, sample_fmts);
if (ret < 0)
return ret;
diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c
index 13decdadc5..8c574f7bda 100644
--- a/libavfilter/af_amerge.c
+++ b/libavfilter/af_amerge.c
@@ -163,7 +163,7 @@ static int query_formats(AVFilterContext *ctx)
default:
av_unreachable("Invalid layout_mode");
}
- if ((ret = ff_set_common_formats_from_list(ctx, packed_sample_fmts)) < 0)
+ if ((ret = ff_set_sample_formats_from_list(ctx, packed_sample_fmts)) < 0)
goto out;
for (i = 0; i < s->nb_inputs; i++) {
layouts = NULL;
diff --git a/libavfilter/af_anequalizer.c b/libavfilter/af_anequalizer.c
index 26df4f7e32..2f39e94cc4 100644
--- a/libavfilter/af_anequalizer.c
+++ b/libavfilter/af_anequalizer.c
@@ -230,12 +230,12 @@ static int query_formats(const AVFilterContext *ctx,
int ret;
if (s->draw_curves) {
- ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, pix_fmts);
+ ret = ff_set_pixel_formats_from_list2(ctx, cfg_in, cfg_out, pix_fmts);
if (ret < 0)
return ret;
}
- ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, sample_fmts);
+ ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out, sample_fmts);
if (ret < 0)
return ret;
diff --git a/libavfilter/af_anlms.c b/libavfilter/af_anlms.c
index b03dd6da2a..3ac20bcc73 100644
--- a/libavfilter/af_anlms.c
+++ b/libavfilter/af_anlms.c
@@ -99,7 +99,7 @@ static int query_formats(const AVFilterContext *ctx,
};
int ret;
- if ((ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out,
+ if ((ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out,
sample_fmts[s->precision])) <
0)
return ret;
diff --git a/libavfilter/af_apulsator.c b/libavfilter/af_apulsator.c
index 71f79a4475..bf462df12a 100644
--- a/libavfilter/af_apulsator.c
+++ b/libavfilter/af_apulsator.c
@@ -200,7 +200,7 @@ static int query_formats(const AVFilterContext *ctx,
int ret;
- ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, formats);
+ ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out, formats);
if (ret < 0)
return ret;
diff --git a/libavfilter/af_aresample.c b/libavfilter/af_aresample.c
index ea9927e7cf..7c6f9141a7 100644
--- a/libavfilter/af_aresample.c
+++ b/libavfilter/af_aresample.c
@@ -105,8 +105,8 @@ static int query_formats(const AVFilterContext *ctx,
return ret;
if(out_format != AV_SAMPLE_FMT_NONE) {
- int formatlist[] = { out_format, -1 };
- out_formats = ff_make_format_list(formatlist);
+ enum AVSampleFormat formatlist[] = { out_format, AV_SAMPLE_FMT_NONE };
+ out_formats = ff_make_sample_format_list(formatlist);
} else
out_formats = ff_all_formats(AVMEDIA_TYPE_AUDIO);
if ((ret = ff_formats_ref(out_formats, &cfg_out[0]->formats)) < 0)
diff --git a/libavfilter/af_arls.c b/libavfilter/af_arls.c
index a74d632d37..da000f181b 100644
--- a/libavfilter/af_arls.c
+++ b/libavfilter/af_arls.c
@@ -96,7 +96,7 @@ static int query_formats(const AVFilterContext *ctx,
};
int ret;
- if ((ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out,
+ if ((ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out,
sample_fmts[s->precision])) <
0)
return ret;
diff --git a/libavfilter/af_arnndn.c b/libavfilter/af_arnndn.c
index 8bdc218781..23eeb17851 100644
--- a/libavfilter/af_arnndn.c
+++ b/libavfilter/af_arnndn.c
@@ -337,7 +337,7 @@ static int query_formats(const AVFilterContext *ctx,
};
int ret, sample_rates[] = { 48000, -1 };
- ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, sample_fmts);
+ ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out, sample_fmts);
if (ret < 0)
return ret;
diff --git a/libavfilter/af_asr.c b/libavfilter/af_asr.c
index c39ac772d3..f596e82a33 100644
--- a/libavfilter/af_asr.c
+++ b/libavfilter/af_asr.c
@@ -139,7 +139,7 @@ static int query_formats(const AVFilterContext *ctx,
int sample_rates[] = { s->rate, -1 };
int ret;
- ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, formats);
+ ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out, formats);
if (ret < 0)
return ret;
diff --git a/libavfilter/af_biquads.c b/libavfilter/af_biquads.c
index 88992e36b9..565da30391 100644
--- a/libavfilter/af_biquads.c
+++ b/libavfilter/af_biquads.c
@@ -190,7 +190,7 @@ static int query_formats(const AVFilterContext *ctx,
sample_fmts_list = auto_sample_fmts;
break;
}
- ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out,
sample_fmts_list);
+ ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out,
sample_fmts_list);
if (ret < 0)
return ret;
diff --git a/libavfilter/af_bs2b.c b/libavfilter/af_bs2b.c
index a6580a69ea..1ef92df9ed 100644
--- a/libavfilter/af_bs2b.c
+++ b/libavfilter/af_bs2b.c
@@ -113,7 +113,7 @@ static int query_formats(const AVFilterContext *ctx,
if (ret < 0)
return ret;
- ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, sample_fmts);
+ ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out, sample_fmts);
if (ret < 0)
return ret;
diff --git a/libavfilter/af_crossfeed.c b/libavfilter/af_crossfeed.c
index bc2fcf52b4..6260313fc9 100644
--- a/libavfilter/af_crossfeed.c
+++ b/libavfilter/af_crossfeed.c
@@ -63,7 +63,7 @@ static int query_formats(const AVFilterContext *ctx,
int ret;
- ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, formats);
+ ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out, formats);
if (ret < 0)
return ret;
diff --git a/libavfilter/af_dialoguenhance.c b/libavfilter/af_dialoguenhance.c
index df9b2d6af2..ecd2be23a9 100644
--- a/libavfilter/af_dialoguenhance.c
+++ b/libavfilter/af_dialoguenhance.c
@@ -82,7 +82,7 @@ static int query_formats(const AVFilterContext *ctx,
AVFilterChannelLayouts *in_layout = NULL, *out_layout = NULL;
int ret;
- ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, formats);
+ ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out, formats);
if (ret < 0)
return ret;
diff --git a/libavfilter/af_earwax.c b/libavfilter/af_earwax.c
index 49a98787ec..ff7b0dde74 100644
--- a/libavfilter/af_earwax.c
+++ b/libavfilter/af_earwax.c
@@ -95,7 +95,7 @@ static int query_formats(const AVFilterContext *ctx,
int ret;
- ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, formats);
+ ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out, formats);
if (ret < 0)
return ret;
diff --git a/libavfilter/af_extrastereo.c b/libavfilter/af_extrastereo.c
index 5403267597..a6b6e86f56 100644
--- a/libavfilter/af_extrastereo.c
+++ b/libavfilter/af_extrastereo.c
@@ -57,7 +57,7 @@ static int query_formats(const AVFilterContext *ctx,
int ret;
- ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, formats);
+ ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out, formats);
if (ret < 0)
return ret;
diff --git a/libavfilter/af_haas.c b/libavfilter/af_haas.c
index 4260bb8556..bb6d243cae 100644
--- a/libavfilter/af_haas.c
+++ b/libavfilter/af_haas.c
@@ -95,7 +95,7 @@ static int query_formats(const AVFilterContext *ctx,
};
int ret;
- ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, formats);
+ ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out, formats);
if (ret < 0)
return ret;
diff --git a/libavfilter/af_hdcd.c b/libavfilter/af_hdcd.c
index 6bded8ef74..f5c1055654 100644
--- a/libavfilter/af_hdcd.c
+++ b/libavfilter/af_hdcd.c
@@ -1636,12 +1636,12 @@ static int query_formats(const AVFilterContext *ctx,
if (ret < 0)
return ret;
- in_formats = ff_make_format_list(sample_fmts_in);
+ in_formats = ff_make_sample_format_list(sample_fmts_in);
ret = ff_formats_ref(in_formats, &cfg_in[0]->formats);
if (ret < 0)
return ret;
- out_formats = ff_make_format_list(sample_fmts_out);
+ out_formats = ff_make_sample_format_list(sample_fmts_out);
ret = ff_formats_ref(out_formats, &cfg_out[0]->formats);
if (ret < 0)
return ret;
diff --git a/libavfilter/af_headphone.c b/libavfilter/af_headphone.c
index fd07633498..a053ec03d9 100644
--- a/libavfilter/af_headphone.c
+++ b/libavfilter/af_headphone.c
@@ -610,7 +610,7 @@ static int query_formats(const AVFilterContext *ctx,
AVFilterChannelLayouts *hrir_layouts = NULL;
int ret, i;
- ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, formats);
+ ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out, formats);
if (ret)
return ret;
diff --git a/libavfilter/af_ladspa.c b/libavfilter/af_ladspa.c
index 0ae2b902cb..ea5eb1a2ef 100644
--- a/libavfilter/af_ladspa.c
+++ b/libavfilter/af_ladspa.c
@@ -702,7 +702,7 @@ static int query_formats(const AVFilterContext *ctx,
AVFilterChannelLayouts *layouts;
static const enum AVSampleFormat sample_fmts[] = {
AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE };
- int ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out,
sample_fmts);
+ int ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out,
sample_fmts);
if (ret < 0)
return ret;
diff --git a/libavfilter/af_loudnorm.c b/libavfilter/af_loudnorm.c
index 00d0a145ae..2636f2245e 100644
--- a/libavfilter/af_loudnorm.c
+++ b/libavfilter/af_loudnorm.c
@@ -740,7 +740,7 @@ static int query_formats(const AVFilterContext *ctx,
};
int ret;
- ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, sample_fmts);
+ ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out, sample_fmts);
if (ret < 0)
return ret;
diff --git a/libavfilter/af_lv2.c b/libavfilter/af_lv2.c
index e5097d60d4..e7f3f9c588 100644
--- a/libavfilter/af_lv2.c
+++ b/libavfilter/af_lv2.c
@@ -483,7 +483,7 @@ static int query_formats(const AVFilterContext *ctx,
AVFilterChannelLayouts *layouts;
static const enum AVSampleFormat sample_fmts[] = {
AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE };
- int ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out,
sample_fmts);
+ int ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out,
sample_fmts);
if (ret < 0)
return ret;
diff --git a/libavfilter/af_replaygain.c b/libavfilter/af_replaygain.c
index db67cc6f4b..1ebae32ec8 100644
--- a/libavfilter/af_replaygain.c
+++ b/libavfilter/af_replaygain.c
@@ -343,7 +343,7 @@ static int query_formats(const AVFilterContext *ctx,
int i, ret;
- ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, formats);
+ ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out, formats);
if (ret < 0)
return ret;
diff --git a/libavfilter/af_sidechaincompress.c
b/libavfilter/af_sidechaincompress.c
index 492442df86..06555cbd26 100644
--- a/libavfilter/af_sidechaincompress.c
+++ b/libavfilter/af_sidechaincompress.c
@@ -314,7 +314,7 @@ static int query_formats(const AVFilterContext *ctx,
if (ret < 0)
return ret;
- if ((ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out,
sample_fmts)) < 0)
+ if ((ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out,
sample_fmts)) < 0)
return ret;
return 0;
diff --git a/libavfilter/af_sofalizer.c b/libavfilter/af_sofalizer.c
index c1b9563566..ed05dc103a 100644
--- a/libavfilter/af_sofalizer.c
+++ b/libavfilter/af_sofalizer.c
@@ -646,7 +646,7 @@ static int query_formats(const AVFilterContext *ctx,
AV_SAMPLE_FMT_NONE
};
- ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, sample_fmts);
+ ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out, sample_fmts);
if (ret)
return ret;
diff --git a/libavfilter/af_stereotools.c b/libavfilter/af_stereotools.c
index 4f2e2616b6..b18f6e6be2 100644
--- a/libavfilter/af_stereotools.c
+++ b/libavfilter/af_stereotools.c
@@ -117,7 +117,7 @@ static int query_formats(const AVFilterContext *ctx,
int ret;
- ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, formats);
+ ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out, formats);
if (ret < 0)
return ret;
diff --git a/libavfilter/af_stereowiden.c b/libavfilter/af_stereowiden.c
index 312a24ffe2..456b4d5aa2 100644
--- a/libavfilter/af_stereowiden.c
+++ b/libavfilter/af_stereowiden.c
@@ -69,7 +69,7 @@ static int query_formats(const AVFilterContext *ctx,
int ret;
- ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, formats);
+ ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out, formats);
if (ret < 0)
return ret;
diff --git a/libavfilter/af_surround.c b/libavfilter/af_surround.c
index 46380192a2..6c973f5187 100644
--- a/libavfilter/af_surround.c
+++ b/libavfilter/af_surround.c
@@ -159,7 +159,7 @@ static int query_formats(const AVFilterContext *ctx,
AVFilterChannelLayouts *layouts = NULL;
int ret;
- ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, formats);
+ ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out, formats);
if (ret)
return ret;
diff --git a/libavfilter/af_virtualbass.c b/libavfilter/af_virtualbass.c
index 41df742aa6..28a6d13e46 100644
--- a/libavfilter/af_virtualbass.c
+++ b/libavfilter/af_virtualbass.c
@@ -60,7 +60,7 @@ static int query_formats(const AVFilterContext *ctx,
AVFilterChannelLayouts *in_layout = NULL, *out_layout = NULL;
int ret;
- ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, formats);
+ ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out, formats);
if (ret < 0)
return ret;
diff --git a/libavfilter/af_volume.c b/libavfilter/af_volume.c
index 603b92f4af..cd40014345 100644
--- a/libavfilter/af_volume.c
+++ b/libavfilter/af_volume.c
@@ -155,7 +155,7 @@ static int query_formats(const AVFilterContext *ctx,
};
int ret;
- ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out,
sample_fmts[vol->precision]);
+ ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out,
sample_fmts[vol->precision]);
if (ret < 0)
return ret;
diff --git a/libavfilter/af_whisper.c b/libavfilter/af_whisper.c
index 3c0eba42f0..d5f9203db1 100644
--- a/libavfilter/af_whisper.c
+++ b/libavfilter/af_whisper.c
@@ -414,7 +414,7 @@ static int query_formats(const AVFilterContext *ctx,
int sample_rates[] = { WHISPER_SAMPLE_RATE, -1 };
int ret;
- ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, sample_fmts);
+ ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out, sample_fmts);
if (ret < 0)
return ret;
diff --git a/libavfilter/asrc_afdelaysrc.c b/libavfilter/asrc_afdelaysrc.c
index 3efa94a942..6d9df77eea 100644
--- a/libavfilter/asrc_afdelaysrc.c
+++ b/libavfilter/asrc_afdelaysrc.c
@@ -89,7 +89,7 @@ static int query_formats(const AVFilterContext *ctx,
int sample_rates[] = { s->sample_rate, -1 };
static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_NONE };
- int ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out,
sample_fmts);
+ int ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out,
sample_fmts);
if (ret < 0)
return ret;
diff --git a/libavfilter/asrc_afirsrc.c b/libavfilter/asrc_afirsrc.c
index 5efcbdcca0..01125cb457 100644
--- a/libavfilter/asrc_afirsrc.c
+++ b/libavfilter/asrc_afirsrc.c
@@ -124,7 +124,7 @@ static av_cold int query_formats(const AVFilterContext *ctx,
AV_SAMPLE_FMT_FLT,
AV_SAMPLE_FMT_NONE
};
- int ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out,
sample_fmts);
+ int ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out,
sample_fmts);
if (ret < 0)
return ret;
diff --git a/libavfilter/asrc_anoisesrc.c b/libavfilter/asrc_anoisesrc.c
index ba425d7925..d22ca255f0 100644
--- a/libavfilter/asrc_anoisesrc.c
+++ b/libavfilter/asrc_anoisesrc.c
@@ -94,7 +94,7 @@ static av_cold int query_formats(const AVFilterContext *ctx,
AV_SAMPLE_FMT_DBL,
AV_SAMPLE_FMT_NONE
};
- int ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out,
sample_fmts);
+ int ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out,
sample_fmts);
if (ret < 0)
return ret;
diff --git a/libavfilter/asrc_flite.c b/libavfilter/asrc_flite.c
index 33576beade..a7471607cf 100644
--- a/libavfilter/asrc_flite.c
+++ b/libavfilter/asrc_flite.c
@@ -278,7 +278,7 @@ static int query_formats(const AVFilterContext *ctx,
if (ret < 0)
return ret;
- ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, formats);
+ ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out, formats);
if (ret < 0)
return ret;
diff --git a/libavfilter/asrc_hilbert.c b/libavfilter/asrc_hilbert.c
index 1470056e9b..e6f69b024f 100644
--- a/libavfilter/asrc_hilbert.c
+++ b/libavfilter/asrc_hilbert.c
@@ -86,7 +86,7 @@ static av_cold int query_formats(const AVFilterContext *ctx,
AV_SAMPLE_FMT_FLT,
AV_SAMPLE_FMT_NONE
};
- int ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out,
sample_fmts);
+ int ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out,
sample_fmts);
if (ret < 0)
return ret;
diff --git a/libavfilter/asrc_sinc.c b/libavfilter/asrc_sinc.c
index ef6841c876..98c3c8dc04 100644
--- a/libavfilter/asrc_sinc.c
+++ b/libavfilter/asrc_sinc.c
@@ -83,7 +83,7 @@ static int query_formats(const AVFilterContext *ctx,
int sample_rates[] = { s->sample_rate, -1 };
static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_FLT,
AV_SAMPLE_FMT_NONE };
- int ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out,
sample_fmts);
+ int ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out,
sample_fmts);
if (ret < 0)
return ret;
diff --git a/libavfilter/asrc_sine.c b/libavfilter/asrc_sine.c
index 1175a79746..2f8a835293 100644
--- a/libavfilter/asrc_sine.c
+++ b/libavfilter/asrc_sine.c
@@ -221,7 +221,7 @@ static av_cold int query_formats(const AVFilterContext *ctx,
int sample_rates[] = { sine->sample_rate, -1 };
static const enum AVSampleFormat sample_fmts[] = { AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_NONE };
- int ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out,
sample_fmts);
+ int ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out,
sample_fmts);
if (ret < 0)
return ret;
diff --git a/libavfilter/avf_a3dscope.c b/libavfilter/avf_a3dscope.c
index fb08720412..07957dcfed 100644
--- a/libavfilter/avf_a3dscope.c
+++ b/libavfilter/avf_a3dscope.c
@@ -82,11 +82,11 @@ static int query_formats(const AVFilterContext *ctx,
static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_RGBA,
AV_PIX_FMT_NONE };
int ret;
- formats = ff_make_format_list(sample_fmts);
+ formats = ff_make_sample_format_list(sample_fmts);
if ((ret = ff_formats_ref(formats, &cfg_in[0]->formats)) < 0)
return ret;
- formats = ff_make_format_list(pix_fmts);
+ formats = ff_make_pixel_format_list(pix_fmts);
if ((ret = ff_formats_ref(formats, &cfg_out[0]->formats)) < 0)
return ret;
diff --git a/libavfilter/avf_abitscope.c b/libavfilter/avf_abitscope.c
index a4b2109473..3a92490368 100644
--- a/libavfilter/avf_abitscope.c
+++ b/libavfilter/avf_abitscope.c
@@ -77,11 +77,11 @@ static int query_formats(const AVFilterContext *ctx,
static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_RGBA,
AV_PIX_FMT_NONE };
int ret;
- formats = ff_make_format_list(sample_fmts);
+ formats = ff_make_sample_format_list(sample_fmts);
if ((ret = ff_formats_ref(formats, &cfg_in[0]->formats)) < 0)
return ret;
- formats = ff_make_format_list(pix_fmts);
+ formats = ff_make_pixel_format_list(pix_fmts);
if ((ret = ff_formats_ref(formats, &cfg_out[0]->formats)) < 0)
return ret;
diff --git a/libavfilter/avf_ahistogram.c b/libavfilter/avf_ahistogram.c
index ce0d82f9ec..33f0e68db0 100644
--- a/libavfilter/avf_ahistogram.c
+++ b/libavfilter/avf_ahistogram.c
@@ -101,11 +101,11 @@ static int query_formats(const AVFilterContext *ctx,
static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUVA444P,
AV_PIX_FMT_NONE };
int ret = AVERROR(EINVAL);
- formats = ff_make_format_list(sample_fmts);
+ formats = ff_make_sample_format_list(sample_fmts);
if ((ret = ff_formats_ref(formats, &cfg_in[0]->formats)) < 0)
return ret;
- formats = ff_make_format_list(pix_fmts);
+ formats = ff_make_pixel_format_list(pix_fmts);
if ((ret = ff_formats_ref(formats, &cfg_out[0]->formats)) < 0)
return ret;
diff --git a/libavfilter/avf_aphasemeter.c b/libavfilter/avf_aphasemeter.c
index eb55d56664..a551158703 100644
--- a/libavfilter/avf_aphasemeter.c
+++ b/libavfilter/avf_aphasemeter.c
@@ -104,7 +104,7 @@ static int query_formats(const AVFilterContext *ctx,
};
int ret;
- formats = ff_make_format_list(sample_fmts);
+ formats = ff_make_sample_format_list(sample_fmts);
if ((ret = ff_formats_ref(formats, &cfg_in[0]->formats)) < 0 ||
(ret = ff_formats_ref(formats, &cfg_out[0]->formats)) < 0)
return ret;
@@ -114,7 +114,7 @@ static int query_formats(const AVFilterContext *ctx,
return ret;
if (s->do_video) {
- formats = ff_make_format_list(pix_fmts);
+ formats = ff_make_pixel_format_list(pix_fmts);
if ((ret = ff_formats_ref(formats, &cfg_out[1]->formats)) < 0)
return ret;
}
diff --git a/libavfilter/avf_avectorscope.c b/libavfilter/avf_avectorscope.c
index 902d461d86..4e477627b5 100644
--- a/libavfilter/avf_avectorscope.c
+++ b/libavfilter/avf_avectorscope.c
@@ -243,7 +243,7 @@ static int query_formats(const AVFilterContext *ctx,
};
int ret;
- formats = ff_make_format_list(sample_fmts);
+ formats = ff_make_sample_format_list(sample_fmts);
if ((ret = ff_formats_ref (formats, &cfg_in[0]->formats ))
< 0)
return ret;
@@ -251,7 +251,7 @@ static int query_formats(const AVFilterContext *ctx,
if (ret < 0)
return ret;
- formats = ff_make_format_list(pix_fmts);
+ formats = ff_make_pixel_format_list(pix_fmts);
if ((ret = ff_formats_ref(formats, &cfg_out[0]->formats)) < 0)
return ret;
diff --git a/libavfilter/avf_showcqt.c b/libavfilter/avf_showcqt.c
index 428e8bff65..bea311cd19 100644
--- a/libavfilter/avf_showcqt.c
+++ b/libavfilter/avf_showcqt.c
@@ -1330,7 +1330,7 @@ static int query_formats(const AVFilterContext *ctx,
int ret;
/* set input audio formats */
- formats = ff_make_format_list(sample_fmts);
+ formats = ff_make_sample_format_list(sample_fmts);
if ((ret = ff_formats_ref(formats, &cfg_in[0]->formats)) < 0)
return ret;
@@ -1339,7 +1339,7 @@ static int query_formats(const AVFilterContext *ctx,
return ret;
/* set output video format */
- formats = ff_make_format_list(pix_fmts);
+ formats = ff_make_pixel_format_list(pix_fmts);
if ((ret = ff_formats_ref(formats, &cfg_out[0]->formats)) < 0)
return ret;
diff --git a/libavfilter/avf_showcwt.c b/libavfilter/avf_showcwt.c
index 8edf2fb43b..5cb2e9f9fa 100644
--- a/libavfilter/avf_showcwt.c
+++ b/libavfilter/avf_showcwt.c
@@ -231,11 +231,11 @@ static int query_formats(const AVFilterContext *ctx,
static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_YUV444P,
AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVA444P, AV_PIX_FMT_NONE };
int ret;
- formats = ff_make_format_list(sample_fmts);
+ formats = ff_make_sample_format_list(sample_fmts);
if ((ret = ff_formats_ref(formats, &cfg_in[0]->formats)) < 0)
return ret;
- formats = ff_make_format_list(pix_fmts);
+ formats = ff_make_pixel_format_list(pix_fmts);
if ((ret = ff_formats_ref(formats, &cfg_out[0]->formats)) < 0)
return ret;
diff --git a/libavfilter/avf_showfreqs.c b/libavfilter/avf_showfreqs.c
index 244b013ada..bbbce2e429 100644
--- a/libavfilter/avf_showfreqs.c
+++ b/libavfilter/avf_showfreqs.c
@@ -126,12 +126,12 @@ static int query_formats(const AVFilterContext *ctx,
int ret;
/* set input audio formats */
- formats = ff_make_format_list(sample_fmts);
+ formats = ff_make_sample_format_list(sample_fmts);
if ((ret = ff_formats_ref(formats, &cfg_in[0]->formats)) < 0)
return ret;
/* set output video format */
- formats = ff_make_format_list(pix_fmts);
+ formats = ff_make_pixel_format_list(pix_fmts);
if ((ret = ff_formats_ref(formats, &cfg_out[0]->formats)) < 0)
return ret;
diff --git a/libavfilter/avf_showspatial.c b/libavfilter/avf_showspatial.c
index 491501e337..db8484c560 100644
--- a/libavfilter/avf_showspatial.c
+++ b/libavfilter/avf_showspatial.c
@@ -90,7 +90,7 @@ static int query_formats(const AVFilterContext *ctx,
static const AVChannelLayout layouts[] = { AV_CHANNEL_LAYOUT_STEREO, {
.nb_channels = 0 } };
int ret;
- formats = ff_make_format_list(sample_fmts);
+ formats = ff_make_sample_format_list(sample_fmts);
if ((ret = ff_formats_ref(formats, &cfg_in[0]->formats)) < 0)
return ret;
@@ -98,7 +98,7 @@ static int query_formats(const AVFilterContext *ctx,
if (ret < 0)
return ret;
- formats = ff_make_format_list(pix_fmts);
+ formats = ff_make_pixel_format_list(pix_fmts);
if ((ret = ff_formats_ref(formats, &cfg_out[0]->formats)) < 0)
return ret;
diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c
index ee71d55894..67bbc77150 100644
--- a/libavfilter/avf_showspectrum.c
+++ b/libavfilter/avf_showspectrum.c
@@ -368,12 +368,12 @@ static int query_formats(const AVFilterContext *ctx,
int ret;
/* set input audio formats */
- formats = ff_make_format_list(sample_fmts);
+ formats = ff_make_sample_format_list(sample_fmts);
if ((ret = ff_formats_ref(formats, &cfg_in[0]->formats)) < 0)
return ret;
/* set output video format */
- formats = ff_make_format_list(pix_fmts);
+ formats = ff_make_pixel_format_list(pix_fmts);
if ((ret = ff_formats_ref(formats, &cfg_out[0]->formats)) < 0)
return ret;
diff --git a/libavfilter/avf_showvolume.c b/libavfilter/avf_showvolume.c
index 8472e86a15..25959cab9b 100644
--- a/libavfilter/avf_showvolume.c
+++ b/libavfilter/avf_showvolume.c
@@ -119,11 +119,11 @@ static int query_formats(const AVFilterContext *ctx,
static const enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_RGBA,
AV_PIX_FMT_NONE };
int ret;
- formats = ff_make_format_list(sample_fmts);
+ formats = ff_make_sample_format_list(sample_fmts);
if ((ret = ff_formats_ref(formats, &cfg_in[0]->formats)) < 0)
return ret;
- formats = ff_make_format_list(pix_fmts);
+ formats = ff_make_pixel_format_list(pix_fmts);
if ((ret = ff_formats_ref(formats, &cfg_out[0]->formats)) < 0)
return ret;
diff --git a/libavfilter/avf_showwaves.c b/libavfilter/avf_showwaves.c
index d1f1277beb..dda15c5306 100644
--- a/libavfilter/avf_showwaves.c
+++ b/libavfilter/avf_showwaves.c
@@ -165,12 +165,12 @@ static int query_formats(const AVFilterContext *ctx,
int ret;
/* set input audio formats */
- formats = ff_make_format_list(sample_fmts);
+ formats = ff_make_sample_format_list(sample_fmts);
if ((ret = ff_formats_ref(formats, &cfg_in[0]->formats)) < 0)
return ret;
/* set output video format */
- formats = ff_make_format_list(pix_fmts);
+ formats = ff_make_pixel_format_list(pix_fmts);
if ((ret = ff_formats_ref(formats, &cfg_out[0]->formats)) < 0)
return ret;
diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c
index d9a124b455..cc9789f57c 100644
--- a/libavfilter/buffersink.c
+++ b/libavfilter/buffersink.c
@@ -400,7 +400,7 @@ static int vsink_query_formats(const AVFilterContext *ctx,
if (buf->nb_pixel_formats || buf->nb_colorspaces || buf->nb_colorranges ||
buf->nb_alphamodes) {
#endif
if (buf->nb_pixel_formats) {
- ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out,
buf->pixel_formats);
+ ret = ff_set_pixel_formats_from_list2(ctx, cfg_in, cfg_out,
buf->pixel_formats);
if (ret < 0)
return ret;
}
@@ -474,7 +474,7 @@ static int asink_query_formats(const AVFilterContext *ctx,
if (buf->nb_sample_formats || buf->nb_samplerates ||
buf->nb_channel_layouts) {
#endif
if (buf->nb_sample_formats) {
- ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out,
buf->sample_formats);
+ ret = ff_set_sample_formats_from_list2(ctx, cfg_in, cfg_out,
buf->sample_formats);
if (ret < 0)
return ret;
}
diff --git a/libavfilter/f_drawgraph.c b/libavfilter/f_drawgraph.c
index f781e8c2fe..c9ac6c0ca9 100644
--- a/libavfilter/f_drawgraph.c
+++ b/libavfilter/f_drawgraph.c
@@ -137,7 +137,7 @@ static int query_formats(const AVFilterContext *ctx,
};
int ret;
- AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
+ AVFilterFormats *fmts_list = ff_make_pixel_format_list(pix_fmts);
if ((ret = ff_formats_ref(fmts_list, &cfg_out[0]->formats)) < 0)
return ret;
diff --git a/libavfilter/f_ebur128.c b/libavfilter/f_ebur128.c
index fa6f1375a3..46ff702e6b 100644
--- a/libavfilter/f_ebur128.c
+++ b/libavfilter/f_ebur128.c
@@ -1022,7 +1022,7 @@ static int query_formats(const AVFilterContext *ctx,
/* set optional output video format */
if (ebur128->do_video) {
- formats = ff_make_format_list(pix_fmts);
+ formats = ff_make_pixel_format_list(pix_fmts);
if ((ret = ff_formats_ref(formats, &cfg_out[0]->formats)) < 0)
return ret;
out_idx = 1;
@@ -1031,7 +1031,7 @@ static int query_formats(const AVFilterContext *ctx,
/* set input and output audio formats
* Note: ff_set_common_* functions are not used because they affect all the
* links, and thus break the video format negotiation */
- formats = ff_make_format_list(sample_fmts);
+ formats = ff_make_sample_format_list(sample_fmts);
if ((ret = ff_formats_ref(formats, &cfg_in[0]->formats)) < 0 ||
(ret = ff_formats_ref(formats, &cfg_out[out_idx]->formats)) < 0)
return ret;
diff --git a/libavfilter/f_graphmonitor.c b/libavfilter/f_graphmonitor.c
index 95c34593d2..547659c1e1 100644
--- a/libavfilter/f_graphmonitor.c
+++ b/libavfilter/f_graphmonitor.c
@@ -156,7 +156,7 @@ static int query_formats(const AVFilterContext *ctx,
};
int ret;
- AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
+ AVFilterFormats *fmts_list = ff_make_pixel_format_list(pix_fmts);
if ((ret = ff_formats_ref(fmts_list, &cfg_out[0]->formats)) < 0)
return ret;
diff --git a/libavfilter/f_select.c b/libavfilter/f_select.c
index 3781e50814..3f0c908d16 100644
--- a/libavfilter/f_select.c
+++ b/libavfilter/f_select.c
@@ -527,7 +527,7 @@ static int query_formats(const AVFilterContext *ctx,
AV_PIX_FMT_YUV420P10,
AV_PIX_FMT_NONE
};
- return ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out,
pix_fmts);
+ return ff_set_pixel_formats_from_list2(ctx, cfg_in, cfg_out, pix_fmts);
}
return 0;
}
diff --git a/libavfilter/src_avsynctest.c b/libavfilter/src_avsynctest.c
index e2c66fd6be..6387d795ec 100644
--- a/libavfilter/src_avsynctest.c
+++ b/libavfilter/src_avsynctest.c
@@ -109,7 +109,7 @@ static av_cold int query_formats(const AVFilterContext *ctx,
AVFilterFormats *formats;
int ret;
- formats = ff_make_format_list(sample_fmts);
+ formats = ff_make_sample_format_list(sample_fmts);
if (!formats)
return AVERROR(ENOMEM);
if ((ret = ff_formats_ref(formats, &cfg_out[0]->formats)) < 0)
diff --git a/libavfilter/vaapi_vpp.c b/libavfilter/vaapi_vpp.c
index 9be076fadb..cb855cc281 100644
--- a/libavfilter/vaapi_vpp.c
+++ b/libavfilter/vaapi_vpp.c
@@ -35,7 +35,7 @@ int ff_vaapi_vpp_query_formats(const AVFilterContext *avctx,
};
int err;
- err = ff_set_common_formats_from_list2(avctx, cfg_in, cfg_out, pix_fmts);
+ err = ff_set_pixel_formats_from_list2(avctx, cfg_in, cfg_out, pix_fmts);
if (err < 0)
return err;
diff --git a/libavfilter/vaf_spectrumsynth.c b/libavfilter/vaf_spectrumsynth.c
index 04d354d504..8873062e23 100644
--- a/libavfilter/vaf_spectrumsynth.c
+++ b/libavfilter/vaf_spectrumsynth.c
@@ -111,7 +111,7 @@ static int query_formats(const AVFilterContext *ctx,
AV_PIX_FMT_YUV444P16,
AV_PIX_FMT_NONE };
int ret, sample_rates[] = { 48000, -1 };
- formats = ff_make_format_list(sample_fmts);
+ formats = ff_make_sample_format_list(sample_fmts);
if ((ret = ff_formats_ref (formats, &cfg_out[0]->formats
)) < 0 ||
(ret = ff_add_channel_layout (&layout,
&FF_COUNT2LAYOUT(s->channels))) < 0 ||
(ret = ff_channel_layouts_ref (layout , &cfg_out[0]->channel_layouts))
< 0)
@@ -124,13 +124,13 @@ static int query_formats(const AVFilterContext *ctx,
if ((ret = ff_formats_ref(formats, &cfg_out[0]->samplerates)) < 0)
return ret;
- formats = ff_make_format_list(pix_fmts);
+ formats = ff_make_pixel_format_list(pix_fmts);
if (!formats)
return AVERROR(ENOMEM);
if ((ret = ff_formats_ref(formats, &cfg_in[MAGNITUDE]->formats)) < 0)
return ret;
- formats = ff_make_format_list(pix_fmts);
+ formats = ff_make_pixel_format_list(pix_fmts);
if (!formats)
return AVERROR(ENOMEM);
if ((ret = ff_formats_ref(formats, &cfg_in[PHASE]->formats)) < 0)
diff --git a/libavfilter/vf_alphamerge.c b/libavfilter/vf_alphamerge.c
index c17a647dbe..b5c7b3d9af 100644
--- a/libavfilter/vf_alphamerge.c
+++ b/libavfilter/vf_alphamerge.c
@@ -111,12 +111,12 @@ static int query_formats(const AVFilterContext *ctx,
static const enum AVPixelFormat alpha_fmts[] = { AV_PIX_FMT_GRAY8,
AV_PIX_FMT_NONE };
int ret;
- ret = ff_formats_ref(ff_make_format_list(alpha_fmts),
+ ret = ff_formats_ref(ff_make_pixel_format_list(alpha_fmts),
&cfg_in[1]->formats);
if (ret < 0)
return ret;
- ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, main_fmts);
+ ret = ff_set_pixel_formats_from_list2(ctx, cfg_in, cfg_out, main_fmts);
if (ret < 0)
return ret;
diff --git a/libavfilter/vf_amf_common.c b/libavfilter/vf_amf_common.c
index c8620bc513..b458de5e5c 100644
--- a/libavfilter/vf_amf_common.c
+++ b/libavfilter/vf_amf_common.c
@@ -218,11 +218,11 @@ int amf_setup_input_output_formats(AVFilterContext *avctx,
}
}
- input_formats = ff_make_format_list(output_pix_fmts);
+ input_formats = ff_make_pixel_format_list(output_pix_fmts);
if (!input_formats) {
return AVERROR(ENOMEM);
}
- output_formats = ff_make_format_list(output_pix_fmts);
+ output_formats = ff_make_pixel_format_list(output_pix_fmts);
if (!output_formats) {
return AVERROR(ENOMEM);
}
diff --git a/libavfilter/vf_blackdetect.c b/libavfilter/vf_blackdetect.c
index 27130170a3..df11a2140e 100644
--- a/libavfilter/vf_blackdetect.c
+++ b/libavfilter/vf_blackdetect.c
@@ -117,9 +117,9 @@ static int query_format(const AVFilterContext *ctx,
const BlackDetectContext *s = ctx->priv;
AVFilterFormats *formats;
if (s->alpha)
- formats = ff_make_format_list(yuva_formats);
+ formats = ff_make_pixel_format_list(yuva_formats);
else
- formats = ff_make_format_list(yuv_formats);
+ formats = ff_make_pixel_format_list(yuv_formats);
return ff_set_common_formats2(ctx, cfg_in, cfg_out, formats);
}
diff --git a/libavfilter/vf_ciescope.c b/libavfilter/vf_ciescope.c
index 3ae9d9c87c..d28cec35f9 100644
--- a/libavfilter/vf_ciescope.c
+++ b/libavfilter/vf_ciescope.c
@@ -145,10 +145,10 @@ static int query_formats(const AVFilterContext *ctx,
{
int ret;
- if ((ret = ff_formats_ref(ff_make_format_list(in_pix_fmts),
&cfg_in[0]->formats)) < 0)
+ if ((ret = ff_formats_ref(ff_make_pixel_format_list(in_pix_fmts),
&cfg_in[0]->formats)) < 0)
return ret;
- if ((ret = ff_formats_ref(ff_make_format_list(out_pix_fmts),
&cfg_out[0]->formats)) < 0)
+ if ((ret = ff_formats_ref(ff_make_pixel_format_list(out_pix_fmts),
&cfg_out[0]->formats)) < 0)
return ret;
return 0;
diff --git a/libavfilter/vf_colorspace.c b/libavfilter/vf_colorspace.c
index 78164e1f34..de9a1a42e4 100644
--- a/libavfilter/vf_colorspace.c
+++ b/libavfilter/vf_colorspace.c
@@ -873,7 +873,7 @@ static int query_formats(const AVFilterContext *ctx,
return res;
}
- formats = ff_make_format_list(pix_fmts);
+ formats = ff_make_pixel_format_list(pix_fmts);
if (!formats)
return AVERROR(ENOMEM);
if (s->user_format == AV_PIX_FMT_NONE)
diff --git a/libavfilter/vf_deband.c b/libavfilter/vf_deband.c
index 043e33669d..97bd33e20e 100644
--- a/libavfilter/vf_deband.c
+++ b/libavfilter/vf_deband.c
@@ -112,7 +112,7 @@ static int query_formats(const AVFilterContext *ctx,
AV_PIX_FMT_NONE
};
- return ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out,
+ return ff_set_pixel_formats_from_list2(ctx, cfg_in, cfg_out,
s->coupling ? cpix_fmts :
pix_fmts);
}
diff --git a/libavfilter/vf_edgedetect.c b/libavfilter/vf_edgedetect.c
index effb049a4c..339ab81c9e 100644
--- a/libavfilter/vf_edgedetect.c
+++ b/libavfilter/vf_edgedetect.c
@@ -116,7 +116,7 @@ static int query_formats(const AVFilterContext *ctx,
} else {
av_assert0(0);
}
- return ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, pix_fmts);
+ return ff_set_pixel_formats_from_list2(ctx, cfg_in, cfg_out, pix_fmts);
}
static int config_props(AVFilterLink *inlink)
diff --git a/libavfilter/vf_elbg.c b/libavfilter/vf_elbg.c
index 7e3e8cecb2..040dc763d0 100644
--- a/libavfilter/vf_elbg.c
+++ b/libavfilter/vf_elbg.c
@@ -98,14 +98,14 @@ static int query_formats(const AVFilterContext *ctx,
AV_PIX_FMT_NONE
};
if (!elbg->pal8) {
- return ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out,
pix_fmts);
+ return ff_set_pixel_formats_from_list2(ctx, cfg_in, cfg_out, pix_fmts);
} else {
static const enum AVPixelFormat pal8_fmt[] = {
AV_PIX_FMT_PAL8,
AV_PIX_FMT_NONE
};
- if ((ret = ff_formats_ref(ff_make_format_list(pix_fmts),
&cfg_in[0]->formats)) < 0 ||
- (ret = ff_formats_ref(ff_make_format_list(pal8_fmt),
&cfg_out[0]->formats)) < 0)
+ if ((ret = ff_formats_ref(ff_make_pixel_format_list(pix_fmts),
&cfg_in[0]->formats)) < 0 ||
+ (ret = ff_formats_ref(ff_make_pixel_format_list(pal8_fmt),
&cfg_out[0]->formats)) < 0)
return ret;
}
return 0;
diff --git a/libavfilter/vf_extractplanes.c b/libavfilter/vf_extractplanes.c
index 19cbb987fb..a50d978f79 100644
--- a/libavfilter/vf_extractplanes.c
+++ b/libavfilter/vf_extractplanes.c
@@ -175,7 +175,7 @@ static int query_formats(AVFilterContext *ctx)
in_pixfmts = in_pixfmts_le;
}
if (!ctx->inputs[0]->outcfg.formats)
- if ((ret = ff_formats_ref(ff_make_format_list(in_pixfmts),
&ctx->inputs[0]->outcfg.formats)) < 0)
+ if ((ret = ff_formats_ref(ff_make_pixel_format_list(in_pixfmts),
&ctx->inputs[0]->outcfg.formats)) < 0)
return ret;
for (i = 1; i < avff->nb_formats; i++) {
@@ -218,7 +218,7 @@ static int query_formats(AVFilterContext *ctx)
return ret;
for (i = 0; i < ctx->nb_outputs; i++)
- if ((ret = ff_formats_ref(ff_make_format_list(out_pixfmts),
&ctx->outputs[i]->incfg.formats)) < 0)
+ if ((ret = ff_formats_ref(ff_make_pixel_format_list(out_pixfmts),
&ctx->outputs[i]->incfg.formats)) < 0)
return ret;
return 0;
}
diff --git a/libavfilter/vf_fade.c b/libavfilter/vf_fade.c
index 794586af07..a9026992f1 100644
--- a/libavfilter/vf_fade.c
+++ b/libavfilter/vf_fade.c
@@ -181,7 +181,7 @@ static int query_formats(const AVFilterContext *ctx,
return ret;
}
- return ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, pixel_fmts);
+ return ff_set_pixel_formats_from_list2(ctx, cfg_in, cfg_out, pixel_fmts);
}
const static enum AVPixelFormat studio_level_pix_fmts[] = {
diff --git a/libavfilter/vf_fieldmatch.c b/libavfilter/vf_fieldmatch.c
index 60b4a602cb..d806910364 100644
--- a/libavfilter/vf_fieldmatch.c
+++ b/libavfilter/vf_fieldmatch.c
@@ -927,7 +927,7 @@ static int query_formats(const AVFilterContext *ctx,
};
int ret;
- AVFilterFormats *fmts_list = ff_make_format_list(pix_fmts);
+ AVFilterFormats *fmts_list = ff_make_pixel_format_list(pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
if (!fm->ppsrc) {
@@ -936,7 +936,7 @@ static int query_formats(const AVFilterContext *ctx,
if ((ret = ff_formats_ref(fmts_list, &cfg_in[INPUT_MAIN]->formats)) < 0)
return ret;
- fmts_list = ff_make_format_list(unproc_pix_fmts);
+ fmts_list = ff_make_pixel_format_list(unproc_pix_fmts);
if (!fmts_list)
return AVERROR(ENOMEM);
if ((ret = ff_formats_ref(fmts_list, &cfg_out[0]->formats)) < 0)
diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c
index cbd236faab..fc1b15821e 100644
--- a/libavfilter/vf_frei0r.c
+++ b/libavfilter/vf_frei0r.c
@@ -348,7 +348,7 @@ static int query_formats(const AVFilterContext *ctx,
static const enum AVPixelFormat pix_fmts[] = {
AV_PIX_FMT_BGRA, AV_PIX_FMT_ARGB, AV_PIX_FMT_ABGR, AV_PIX_FMT_NONE
};
- formats = ff_make_format_list(pix_fmts);
+ formats = ff_make_pixel_format_list(pix_fmts);
}
if (!formats)
diff --git a/libavfilter/vf_geq.c b/libavfilter/vf_geq.c
index bec1ac2ba3..13b0065956 100644
--- a/libavfilter/vf_geq.c
+++ b/libavfilter/vf_geq.c
@@ -373,7 +373,7 @@ static int geq_query_formats(const AVFilterContext *ctx,
};
const enum AVPixelFormat *pix_fmts = geq->is_rgb ? rgb_pix_fmts :
yuv_pix_fmts;
- return ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, pix_fmts);
+ return ff_set_pixel_formats_from_list2(ctx, cfg_in, cfg_out, pix_fmts);
}
static int geq_config_props(AVFilterLink *inlink)
diff --git a/libavfilter/vf_histogram.c b/libavfilter/vf_histogram.c
index 1a5626b317..0dfebc62d1 100644
--- a/libavfilter/vf_histogram.c
+++ b/libavfilter/vf_histogram.c
@@ -177,7 +177,7 @@ static int query_formats(AVFilterContext *ctx)
}
if (!ctx->inputs[0]->outcfg.formats)
- if ((ret = ff_formats_ref(ff_make_format_list(levels_in_pix_fmts),
&ctx->inputs[0]->outcfg.formats)) < 0)
+ if ((ret =
ff_formats_ref(ff_make_pixel_format_list(levels_in_pix_fmts),
&ctx->inputs[0]->outcfg.formats)) < 0)
return ret;
avff = ctx->inputs[0]->incfg.formats;
desc = av_pix_fmt_desc_get(avff->formats[0]);
@@ -208,7 +208,7 @@ static int query_formats(AVFilterContext *ctx)
out_pix_fmts = levels_out_yuv12_pix_fmts;
else
return AVERROR(EAGAIN);
- if ((ret = ff_formats_ref(ff_make_format_list(out_pix_fmts),
&ctx->outputs[0]->incfg.formats)) < 0)
+ if ((ret = ff_formats_ref(ff_make_pixel_format_list(out_pix_fmts),
&ctx->outputs[0]->incfg.formats)) < 0)
return ret;
return 0;
diff --git a/libavfilter/vf_hwupload.c b/libavfilter/vf_hwupload.c
index 6aafac4d4d..ec3d963fd0 100644
--- a/libavfilter/vf_hwupload.c
+++ b/libavfilter/vf_hwupload.c
@@ -85,7 +85,7 @@ static int hwupload_query_formats(const AVFilterContext
*avctx,
input_pix_fmts = constraints->valid_sw_formats;
output_pix_fmts = constraints->valid_hw_formats;
- input_formats = ff_make_format_list(output_pix_fmts);
+ input_formats = ff_make_pixel_format_list(output_pix_fmts);
if (!input_formats) {
err = AVERROR(ENOMEM);
goto fail;
@@ -99,7 +99,7 @@ static int hwupload_query_formats(const AVFilterContext
*avctx,
}
if ((err = ff_formats_ref(input_formats, &cfg_in[0]->formats)) < 0 ||
- (err = ff_formats_ref(ff_make_format_list(output_pix_fmts),
+ (err = ff_formats_ref(ff_make_pixel_format_list(output_pix_fmts),
&cfg_out[0]->formats)) < 0)
goto fail;
diff --git a/libavfilter/vf_hwupload_cuda.c b/libavfilter/vf_hwupload_cuda.c
index 34f959ca50..8acfe5c5f9 100644
--- a/libavfilter/vf_hwupload_cuda.c
+++ b/libavfilter/vf_hwupload_cuda.c
@@ -70,14 +70,14 @@ static int cudaupload_query_formats(const AVFilterContext
*ctx,
static const enum AVPixelFormat output_pix_fmts[] = {
AV_PIX_FMT_CUDA, AV_PIX_FMT_NONE,
};
- AVFilterFormats *in_fmts = ff_make_format_list(input_pix_fmts);
+ AVFilterFormats *in_fmts = ff_make_pixel_format_list(input_pix_fmts);
AVFilterFormats *out_fmts;
ret = ff_formats_ref(in_fmts, &cfg_in[0]->formats);
if (ret < 0)
return ret;
- out_fmts = ff_make_format_list(output_pix_fmts);
+ out_fmts = ff_make_pixel_format_list(output_pix_fmts);
ret = ff_formats_ref(out_fmts, &cfg_out[0]->formats);
if (ret < 0)
diff --git a/libavfilter/vf_lut.c b/libavfilter/vf_lut.c
index d15fb85c4e..ed00969e75 100644
--- a/libavfilter/vf_lut.c
+++ b/libavfilter/vf_lut.c
@@ -154,7 +154,7 @@ static int query_formats(const AVFilterContext *ctx,
const enum AVPixelFormat *pix_fmts = s->is_rgb ? rgb_pix_fmts :
s->is_yuv ? yuv_pix_fmts :
all_pix_fmts;
- return ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, pix_fmts);
+ return ff_set_pixel_formats_from_list2(ctx, cfg_in, cfg_out, pix_fmts);
}
/**
diff --git a/libavfilter/vf_lut2.c b/libavfilter/vf_lut2.c
index a37c0db949..3b8ee3af65 100644
--- a/libavfilter/vf_lut2.c
+++ b/libavfilter/vf_lut2.c
@@ -180,9 +180,9 @@ static int query_formats(const AVFilterContext *ctx,
int ret;
if (s->tlut2 || !s->odepth)
- return ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out,
all_pix_fmts);
+ return ff_set_pixel_formats_from_list2(ctx, cfg_in, cfg_out,
all_pix_fmts);
- ret = ff_formats_ref(ff_make_format_list(all_pix_fmts),
&cfg_in[0]->formats);
+ ret = ff_formats_ref(ff_make_pixel_format_list(all_pix_fmts),
&cfg_in[0]->formats);
if (ret < 0)
return ret;
@@ -196,7 +196,7 @@ static int query_formats(const AVFilterContext *ctx,
default: av_assert0(0);
}
- return ff_formats_ref(ff_make_format_list(pix_fmts), &cfg_out[0]->formats);
+ return ff_formats_ref(ff_make_pixel_format_list(pix_fmts),
&cfg_out[0]->formats);
}
static int config_inputx(AVFilterLink *inlink)
diff --git a/libavfilter/vf_overlay.c b/libavfilter/vf_overlay.c
index 9149d061b9..cdd5448076 100644
--- a/libavfilter/vf_overlay.c
+++ b/libavfilter/vf_overlay.c
@@ -274,17 +274,17 @@ static int query_formats(const AVFilterContext *ctx,
overlay_formats = overlay_pix_fmts_gbrp;
break;
case OVERLAY_FORMAT_AUTO:
- return ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out,
alpha_pix_fmts);
+ return ff_set_pixel_formats_from_list2(ctx, cfg_in, cfg_out,
alpha_pix_fmts);
default:
av_assert0(0);
}
- formats = ff_make_format_list(main_formats);
+ formats = ff_make_pixel_format_list(main_formats);
if ((ret = ff_formats_ref(formats, &cfg_in[MAIN]->formats)) < 0 ||
(ret = ff_formats_ref(formats, &cfg_out[MAIN]->formats)) < 0)
return ret;
- return ff_formats_ref(ff_make_format_list(overlay_formats),
+ return ff_formats_ref(ff_make_pixel_format_list(overlay_formats),
&cfg_in[OVERLAY]->formats);
}
diff --git a/libavfilter/vf_overlay_qsv.c b/libavfilter/vf_overlay_qsv.c
index ce4a13e957..5e75cc77c3 100644
--- a/libavfilter/vf_overlay_qsv.c
+++ b/libavfilter/vf_overlay_qsv.c
@@ -388,12 +388,12 @@ static int overlay_qsv_query_formats(const
AVFilterContext *ctx,
};
for (i = 0; i < ctx->nb_inputs; i++) {
- ret = ff_formats_ref(ff_make_format_list(main_in_fmts),
&cfg_in[i]->formats);
+ ret = ff_formats_ref(ff_make_pixel_format_list(main_in_fmts),
&cfg_in[i]->formats);
if (ret < 0)
return ret;
}
- ret = ff_formats_ref(ff_make_format_list(out_pix_fmts),
&cfg_out[0]->formats);
+ ret = ff_formats_ref(ff_make_pixel_format_list(out_pix_fmts),
&cfg_out[0]->formats);
if (ret < 0)
return ret;
diff --git a/libavfilter/vf_palettegen.c b/libavfilter/vf_palettegen.c
index 2012e987e6..235adf0614 100644
--- a/libavfilter/vf_palettegen.c
+++ b/libavfilter/vf_palettegen.c
@@ -108,9 +108,9 @@ static int query_formats(const AVFilterContext *ctx,
static const enum AVPixelFormat out_fmts[] = {AV_PIX_FMT_RGB32,
AV_PIX_FMT_NONE};
int ret;
- if ((ret = ff_formats_ref(ff_make_format_list(in_fmts) ,
&cfg_in[0]->formats)) < 0)
+ if ((ret = ff_formats_ref(ff_make_pixel_format_list(in_fmts) ,
&cfg_in[0]->formats)) < 0)
return ret;
- if ((ret = ff_formats_ref(ff_make_format_list(out_fmts),
&cfg_out[0]->formats)) < 0)
+ if ((ret = ff_formats_ref(ff_make_pixel_format_list(out_fmts),
&cfg_out[0]->formats)) < 0)
return ret;
return 0;
}
diff --git a/libavfilter/vf_paletteuse.c b/libavfilter/vf_paletteuse.c
index 72711f96ef..93e117f7d0 100644
--- a/libavfilter/vf_paletteuse.c
+++ b/libavfilter/vf_paletteuse.c
@@ -144,11 +144,11 @@ static int query_formats(const AVFilterContext *ctx,
static const enum AVPixelFormat inpal_fmts[] = {AV_PIX_FMT_RGB32,
AV_PIX_FMT_NONE};
static const enum AVPixelFormat out_fmts[] = {AV_PIX_FMT_PAL8,
AV_PIX_FMT_NONE};
int ret;
- if ((ret = ff_formats_ref(ff_make_format_list(in_fmts),
+ if ((ret = ff_formats_ref(ff_make_pixel_format_list(in_fmts),
&cfg_in[0]->formats)) < 0 ||
- (ret = ff_formats_ref(ff_make_format_list(inpal_fmts),
+ (ret = ff_formats_ref(ff_make_pixel_format_list(inpal_fmts),
&cfg_in[1]->formats)) < 0 ||
- (ret = ff_formats_ref(ff_make_format_list(out_fmts),
+ (ret = ff_formats_ref(ff_make_pixel_format_list(out_fmts),
&cfg_out[0]->formats)) < 0)
return ret;
return 0;
diff --git a/libavfilter/vf_premultiply.c b/libavfilter/vf_premultiply.c
index 9b4fc39ccb..93e74d6c93 100644
--- a/libavfilter/vf_premultiply.c
+++ b/libavfilter/vf_premultiply.c
@@ -91,7 +91,7 @@ static int query_formats(const AVFilterContext *ctx,
AV_PIX_FMT_NONE
};
- ret = ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out,
+ ret = ff_set_pixel_formats_from_list2(ctx, cfg_in, cfg_out,
s->inplace ? alpha_pix_fmts :
no_alpha_pix_fmts);
if (ret < 0)
return ret;
diff --git a/libavfilter/vf_remap.c b/libavfilter/vf_remap.c
index 8146159d93..c3f02c4cfc 100644
--- a/libavfilter/vf_remap.c
+++ b/libavfilter/vf_remap.c
@@ -117,12 +117,12 @@ static int query_formats(const AVFilterContext *ctx,
AVFilterFormats *pix_formats = NULL, *map_formats = NULL;
int ret;
- pix_formats = ff_make_format_list(s->format ? gray_pix_fmts : pix_fmts);
+ pix_formats = ff_make_pixel_format_list(s->format ? gray_pix_fmts :
pix_fmts);
if ((ret = ff_formats_ref(pix_formats, &cfg_in[0]->formats)) < 0 ||
(ret = ff_formats_ref(pix_formats, &cfg_out[0]->formats)) < 0)
return ret;
- map_formats = ff_make_format_list(map_fmts);
+ map_formats = ff_make_pixel_format_list(map_fmts);
if ((ret = ff_formats_ref(map_formats, &cfg_in[1]->formats)) < 0)
return ret;
return ff_formats_ref(map_formats, &cfg_in[2]->formats);
diff --git a/libavfilter/vf_showpalette.c b/libavfilter/vf_showpalette.c
index 847b448f96..0a2d9e4e30 100644
--- a/libavfilter/vf_showpalette.c
+++ b/libavfilter/vf_showpalette.c
@@ -47,12 +47,12 @@ static int query_formats(const AVFilterContext *ctx,
{
static const enum AVPixelFormat in_fmts[] = {AV_PIX_FMT_PAL8,
AV_PIX_FMT_NONE};
static const enum AVPixelFormat out_fmts[] = {AV_PIX_FMT_RGB32,
AV_PIX_FMT_NONE};
- int ret = ff_formats_ref(ff_make_format_list(in_fmts),
+ int ret = ff_formats_ref(ff_make_pixel_format_list(in_fmts),
&cfg_in[0]->formats);
if (ret < 0)
return ret;
- return ff_formats_ref(ff_make_format_list(out_fmts),
+ return ff_formats_ref(ff_make_pixel_format_list(out_fmts),
&cfg_out[0]->formats);
}
diff --git a/libavfilter/vf_stereo3d.c b/libavfilter/vf_stereo3d.c
index d5d4cc1702..da0681077f 100644
--- a/libavfilter/vf_stereo3d.c
+++ b/libavfilter/vf_stereo3d.c
@@ -307,7 +307,7 @@ static int query_formats(const AVFilterContext *ctx,
pix_fmts = other_pix_fmts;
}
- return ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, pix_fmts);
+ return ff_set_pixel_formats_from_list2(ctx, cfg_in, cfg_out, pix_fmts);
}
static inline uint8_t ana_convert(const int *coeff, const uint8_t *left, const
uint8_t *right)
diff --git a/libavfilter/vf_thumbnail.c b/libavfilter/vf_thumbnail.c
index 728880e100..b594996b9b 100644
--- a/libavfilter/vf_thumbnail.c
+++ b/libavfilter/vf_thumbnail.c
@@ -365,7 +365,7 @@ static int query_formats(const AVFilterContext *ctx,
const AVPixFmtDescriptor *desc = NULL;
AVFilterFormats *formats;
- formats = ff_make_format_list(packed_rgb_fmts);
+ formats = ff_make_pixel_format_list(packed_rgb_fmts);
if (!formats)
return AVERROR(ENOMEM);
diff --git a/libavfilter/vf_v360.c b/libavfilter/vf_v360.c
index 1cfe408887..a5297c81e9 100644
--- a/libavfilter/vf_v360.c
+++ b/libavfilter/vf_v360.c
@@ -252,7 +252,7 @@ static int query_formats(const AVFilterContext *ctx,
AV_PIX_FMT_NONE
};
- return ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out,
+ return ff_set_pixel_formats_from_list2(ctx, cfg_in, cfg_out,
s->alpha ? alpha_pix_fmts :
pix_fmts);
}
diff --git a/libavfilter/vf_vectorscope.c b/libavfilter/vf_vectorscope.c
index 483132332e..db9b5f9e8c 100644
--- a/libavfilter/vf_vectorscope.c
+++ b/libavfilter/vf_vectorscope.c
@@ -229,7 +229,7 @@ static int query_formats(AVFilterContext *ctx)
in_pix_fmts = in2_pix_fmts;
else
in_pix_fmts = in1_pix_fmts;
- if ((ret = ff_formats_ref(ff_make_format_list(in_pix_fmts),
&ctx->inputs[0]->outcfg.formats)) < 0)
+ if ((ret = ff_formats_ref(ff_make_pixel_format_list(in_pix_fmts),
&ctx->inputs[0]->outcfg.formats)) < 0)
return ret;
}
@@ -262,7 +262,7 @@ static int query_formats(AVFilterContext *ctx)
out_pix_fmts = out_yuv12_pix_fmts;
else
return AVERROR(EAGAIN);
- if ((ret = ff_formats_ref(ff_make_format_list(out_pix_fmts),
&ctx->outputs[0]->incfg.formats)) < 0)
+ if ((ret = ff_formats_ref(ff_make_pixel_format_list(out_pix_fmts),
&ctx->outputs[0]->incfg.formats)) < 0)
return ret;
return 0;
diff --git a/libavfilter/vf_vpp_qsv.c b/libavfilter/vf_vpp_qsv.c
index 0a33c377c8..4de99d6490 100644
--- a/libavfilter/vf_vpp_qsv.c
+++ b/libavfilter/vf_vpp_qsv.c
@@ -952,7 +952,7 @@ static int vpp_query_formats(const AVFilterContext *ctx,
};
static enum AVPixelFormat out_pix_fmts[4];
- ret = ff_formats_ref(ff_make_format_list(in_pix_fmts),
+ ret = ff_formats_ref(ff_make_pixel_format_list(in_pix_fmts),
&cfg_in[0]->formats);
if (ret < 0)
return ret;
@@ -969,7 +969,7 @@ static int vpp_query_formats(const AVFilterContext *ctx,
out_pix_fmts[i++] = AV_PIX_FMT_QSV;
out_pix_fmts[i++] = AV_PIX_FMT_NONE;
- return ff_formats_ref(ff_make_format_list(out_pix_fmts),
+ return ff_formats_ref(ff_make_pixel_format_list(out_pix_fmts),
&cfg_out[0]->formats);
}
diff --git a/libavfilter/vf_waveform.c b/libavfilter/vf_waveform.c
index 3c1cfcdc20..4753999d0e 100644
--- a/libavfilter/vf_waveform.c
+++ b/libavfilter/vf_waveform.c
@@ -345,7 +345,7 @@ static int query_formats(AVFilterContext *ctx)
}
if (!ctx->inputs[0]->outcfg.formats) {
- if ((ret = ff_formats_ref(ff_make_format_list(in_pix_fmts),
&ctx->inputs[0]->outcfg.formats)) < 0)
+ if ((ret = ff_formats_ref(ff_make_pixel_format_list(in_pix_fmts),
&ctx->inputs[0]->outcfg.formats)) < 0)
return ret;
}
@@ -393,7 +393,7 @@ static int query_formats(AVFilterContext *ctx)
out_pix_fmts = out_yuv12_lowpass_pix_fmts;
else
return AVERROR(EAGAIN);
- if ((ret = ff_formats_ref(ff_make_format_list(out_pix_fmts),
&ctx->outputs[0]->incfg.formats)) < 0)
+ if ((ret = ff_formats_ref(ff_make_pixel_format_list(out_pix_fmts),
&ctx->outputs[0]->incfg.formats)) < 0)
return ret;
return 0;
diff --git a/libavfilter/vf_zscale.c b/libavfilter/vf_zscale.c
index b800c89cbb..b14d704663 100644
--- a/libavfilter/vf_zscale.c
+++ b/libavfilter/vf_zscale.c
@@ -208,10 +208,10 @@ static int query_formats(const AVFilterContext *ctx,
};
int ret;
- ret = ff_formats_ref(ff_make_format_list(pixel_fmts), &cfg_in[0]->formats);
+ ret = ff_formats_ref(ff_make_pixel_format_list(pixel_fmts),
&cfg_in[0]->formats);
if (ret < 0)
return ret;
- ret = ff_formats_ref(ff_make_format_list(pixel_fmts),
&cfg_out[0]->formats);
+ ret = ff_formats_ref(ff_make_pixel_format_list(pixel_fmts),
&cfg_out[0]->formats);
if (ret < 0)
return ret;
diff --git a/libavfilter/vsrc_life.c b/libavfilter/vsrc_life.c
index cacdcfd963..aa1fafe674 100644
--- a/libavfilter/vsrc_life.c
+++ b/libavfilter/vsrc_life.c
@@ -432,7 +432,7 @@ static int query_formats(const AVFilterContext *ctx,
AV_PIX_FMT_NONE
};
- return ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, pix_fmts);
+ return ff_set_pixel_formats_from_list2(ctx, cfg_in, cfg_out, pix_fmts);
}
static const AVFilterPad life_outputs[] = {
diff --git a/libavfilter/vsrc_perlin.c b/libavfilter/vsrc_perlin.c
index f98496e5d3..46c226ef91 100644
--- a/libavfilter/vsrc_perlin.c
+++ b/libavfilter/vsrc_perlin.c
@@ -148,7 +148,7 @@ static int query_formats(const AVFilterContext *ctx,
{
enum AVPixelFormat pix_fmts[] = { AV_PIX_FMT_GRAY8, AV_PIX_FMT_NONE };
- return ff_set_common_formats_from_list2(ctx, cfg_in, cfg_out, pix_fmts);
+ return ff_set_pixel_formats_from_list2(ctx, cfg_in, cfg_out, pix_fmts);
}
static const AVFilterPad perlin_outputs[] = {
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
