Adds unknown channel layout support for filters where query_formats is not
specified. List of the affected filters:
abench
afifo
ainterleave
aloop
ametadata
anull
anullsink
apad
aperms
arealtime
aselect
asendcmd
asetnsamples
asetpts
asettb
ashowinfo
asidedata
asplit
asyncts
atrim
azmq
Also remove query_formats from filters which already allowed all layouts.
Signed-off-by: Marton Balint <c...@passwd.hu>
---
libavfilter/af_anull.c | 1 -
libavfilter/f_loop.c | 1 -
libavfilter/f_metadata.c | 1 -
libavfilter/f_sidedata.c | 1 -
libavfilter/formats.c | 5 -----
libavfilter/formats.h | 10 ----------
libavfilter/split.c | 1 -
libavfilter/trim.c | 1 -
8 files changed, 21 deletions(-)
diff --git a/libavfilter/af_anull.c b/libavfilter/af_anull.c
index fff456e..1d0af45 100644
--- a/libavfilter/af_anull.c
+++ b/libavfilter/af_anull.c
@@ -46,7 +46,6 @@ static const AVFilterPad avfilter_af_anull_outputs[] = {
AVFilter ff_af_anull = {
.name = "anull",
.description = NULL_IF_CONFIG_SMALL("Pass the source unchanged to the
output."),
- .query_formats = ff_query_formats_all,
.inputs = avfilter_af_anull_inputs,
.outputs = avfilter_af_anull_outputs,
};
diff --git a/libavfilter/f_loop.c b/libavfilter/f_loop.c
index 69bfb10..5a32807 100644
--- a/libavfilter/f_loop.c
+++ b/libavfilter/f_loop.c
@@ -233,7 +233,6 @@ AVFilter ff_af_aloop = {
.priv_size = sizeof(LoopContext),
.priv_class = &aloop_class,
.uninit = auninit,
- .query_formats = ff_query_formats_all,
.inputs = ainputs,
.outputs = aoutputs,
};
diff --git a/libavfilter/f_metadata.c b/libavfilter/f_metadata.c
index 24deccf..1f613ec 100644
--- a/libavfilter/f_metadata.c
+++ b/libavfilter/f_metadata.c
@@ -373,7 +373,6 @@ AVFilter ff_af_ametadata = {
.priv_class = &ametadata_class,
.init = init,
.uninit = uninit,
- .query_formats = ff_query_formats_all,
.inputs = ainputs,
.outputs = aoutputs,
.flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC,
diff --git a/libavfilter/f_sidedata.c b/libavfilter/f_sidedata.c
index 4863cc9..45d246b 100644
--- a/libavfilter/f_sidedata.c
+++ b/libavfilter/f_sidedata.c
@@ -139,7 +139,6 @@ AVFilter ff_af_asidedata = {
.priv_size = sizeof(SideDataContext),
.priv_class = &asidedata_class,
.init = init,
- .query_formats = ff_query_formats_all,
.inputs = ainputs,
.outputs = aoutputs,
.flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC,
diff --git a/libavfilter/formats.c b/libavfilter/formats.c
index 20f45e3..0661618 100644
--- a/libavfilter/formats.c
+++ b/libavfilter/formats.c
@@ -596,11 +596,6 @@ static int default_query_formats_common(AVFilterContext
*ctx,
int ff_default_query_formats(AVFilterContext *ctx)
{
- return default_query_formats_common(ctx, ff_all_channel_layouts);
-}
-
-int ff_query_formats_all(AVFilterContext *ctx)
-{
return default_query_formats_common(ctx, ff_all_channel_counts);
}
diff --git a/libavfilter/formats.h b/libavfilter/formats.h
index 77981f5..7e05ece 100644
--- a/libavfilter/formats.h
+++ b/libavfilter/formats.h
@@ -187,16 +187,6 @@ av_warn_unused_result
int ff_default_query_formats(AVFilterContext *ctx);
/**
- * Set the formats list to all existing formats.
- * This function behaves like ff_default_query_formats(), except it also
- * accepts channel layouts with unknown disposition. It should only be used
- * with audio filters.
- */
-av_warn_unused_result
-int ff_query_formats_all(AVFilterContext *ctx);
-
-
-/**
* Create a list of supported formats. This is intended for use in
* AVFilter->query_formats().
*
diff --git a/libavfilter/split.c b/libavfilter/split.c
index 6cf4ab1..6630087 100644
--- a/libavfilter/split.c
+++ b/libavfilter/split.c
@@ -144,7 +144,6 @@ AVFilter ff_af_asplit = {
.priv_class = &asplit_class,
.init = split_init,
.uninit = split_uninit,
- .query_formats = ff_query_formats_all,
.inputs = avfilter_af_asplit_inputs,
.outputs = NULL,
.flags = AVFILTER_FLAG_DYNAMIC_OUTPUTS,
diff --git a/libavfilter/trim.c b/libavfilter/trim.c
index 9daaeaf..1dbbabb 100644
--- a/libavfilter/trim.c
+++ b/libavfilter/trim.c
@@ -365,7 +365,6 @@ AVFilter ff_af_atrim = {
.name = "atrim",
.description = NULL_IF_CONFIG_SMALL("Pick one continuous section from the
input, drop the rest."),
.init = init,
- .query_formats = ff_query_formats_all,
.priv_size = sizeof(TrimContext),
.priv_class = &atrim_class,
.inputs = atrim_inputs,
--
2.10.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
