avfilter/formats: Schedule avfilter_make_format64_list() for removal

Despite its name, this function is not part of the public API, as
formats.h, the header containing its declaration, is a private header.
The formats API was once public API, but that changed long ago
(b74a1da49db5ebed51aceae6cacc2329288a92c1, the commit scheduling it to
become private, is from 2012). That avfilter_make_format64_list() was
forgotten is probably a result of the confusion resulting from the
libav-ffmpeg split.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>

diff --git a/libavfilter/aeval.c b/libavfilter/aeval.c
index 855dc0009d3e3fd636d4b5c9b8763aedf11d73a9..c7a8cd6550c1fe770a85cfc06ff4f611d02ce326 100644 (file)
--- a/libavfilter/aeval.c
+++ b/libavfilter/aeval.c
@@ -258,7 +258,7 @@ static int query_formats(AVFilterContext *ctx)
     if (ret < 0)
         return ret;
 
-    layouts = avfilter_make_format64_list(chlayouts);
+    layouts = ff_make_format64_list(chlayouts);
     if (!layouts)
         return AVERROR(ENOMEM);
     ret = ff_set_common_channel_layouts(ctx, layouts);

diff --git a/libavfilter/af_aresample.c b/libavfilter/af_aresample.c
index fb10bd1c333fa9626a980974334e8e8e8a7f5b98..b7b1b5ba3cfd595e1a3ba7fc534b4f796ce9f035 100644 (file)
--- a/libavfilter/af_aresample.c
+++ b/libavfilter/af_aresample.c
@@ -126,7 +126,7 @@ static int query_formats(AVFilterContext *ctx)
 
     if(out_layout) {
         int64_t layout_list[] = { out_layout, -1 };
-        out_layouts = avfilter_make_format64_list(layout_list);
+        out_layouts = ff_make_format64_list(layout_list);
     } else
         out_layouts = ff_all_channel_counts();
 

diff --git a/libavfilter/asrc_afirsrc.c b/libavfilter/asrc_afirsrc.c
index b90ffad57f3c524348da574511cee0426deab822..d8ba8f6a54b28f7296674d0f97666fa7cb75b5bf 100644 (file)
--- a/libavfilter/asrc_afirsrc.c
+++ b/libavfilter/asrc_afirsrc.c
@@ -145,7 +145,7 @@ static av_cold int query_formats(AVFilterContext *ctx)
     if (ret < 0)
         return ret;
 
-    layouts = avfilter_make_format64_list(chlayouts);
+    layouts = ff_make_format64_list(chlayouts);
     if (!layouts)
         return AVERROR(ENOMEM);
     ret = ff_set_common_channel_layouts(ctx, layouts);

diff --git a/libavfilter/asrc_anoisesrc.c b/libavfilter/asrc_anoisesrc.c
index 7aa878707dbf851bbfe9a45ce6a636437844a042..40ee0770019fd2ae3c449e4e661c3c05d138c7e2 100644 (file)
--- a/libavfilter/asrc_anoisesrc.c
+++ b/libavfilter/asrc_anoisesrc.c
@@ -101,7 +101,7 @@ static av_cold int query_formats(AVFilterContext *ctx)
     if (ret < 0)
         return ret;
 
-    layouts = avfilter_make_format64_list(chlayouts);
+    layouts = ff_make_format64_list(chlayouts);
     if (!layouts)
         return AVERROR(ENOMEM);
     ret = ff_set_common_channel_layouts(ctx, layouts);

diff --git a/libavfilter/asrc_anullsrc.c b/libavfilter/asrc_anullsrc.c
index 52db61685d487073b92b8fb573dbcc210f5fef30..7093f08275380033289f67178d6a228e07674f24 100644 (file)
--- a/libavfilter/asrc_anullsrc.c
+++ b/libavfilter/asrc_anullsrc.c
@@ -83,11 +83,10 @@ static int query_formats(AVFilterContext *ctx)
     int ret;
 
     if ((ret = ff_set_common_formats         (ctx, ff_all_formats              (AVMEDIA_TYPE_AUDIO))) < 0 ||
-        (ret = ff_set_common_channel_layouts (ctx, avfilter_make_format64_list (chlayouts         ))) < 0 ||
         (ret = ff_set_common_samplerates     (ctx, ff_make_format_list         (sample_rates      ))) < 0)
         return ret;
 
-    return 0;
+    return ff_set_common_channel_layouts(ctx, ff_make_format64_list(chlayouts));
 }
 
 static int config_props(AVFilterLink *outlink)

diff --git a/libavfilter/asrc_hilbert.c b/libavfilter/asrc_hilbert.c
index a51c676c6fe1490eac4ec0253841455a1433ce44..640dfe46f92501151dd8dba3cf0608ca00a2d240 100644 (file)
--- a/libavfilter/asrc_hilbert.c
+++ b/libavfilter/asrc_hilbert.c
@@ -113,7 +113,7 @@ static av_cold int query_formats(AVFilterContext *ctx)
     if (ret < 0)
         return ret;
 
-    layouts = avfilter_make_format64_list(chlayouts);
+    layouts = ff_make_format64_list(chlayouts);
     if (!layouts)
         return AVERROR(ENOMEM);
     ret = ff_set_common_channel_layouts(ctx, layouts);

diff --git a/libavfilter/asrc_sinc.c b/libavfilter/asrc_sinc.c
index 24aeab6e7bdd01fbcb1aa987d5cc40460f18eba8..c3ecb864d1c86788847d715370ef6eda42b1fe8f 100644 (file)
--- a/libavfilter/asrc_sinc.c
+++ b/libavfilter/asrc_sinc.c
@@ -84,7 +84,7 @@ static int query_formats(AVFilterContext *ctx)
     if (ret < 0)
         return ret;
 
-    layouts = avfilter_make_format64_list(chlayouts);
+    layouts = ff_make_format64_list(chlayouts);
     if (!layouts)
         return AVERROR(ENOMEM);
     ret = ff_set_common_channel_layouts(ctx, layouts);

diff --git a/libavfilter/asrc_sine.c b/libavfilter/asrc_sine.c
index 3a87210b4b1d3334cb49bf9e16c650b3e5f62e25..6fe080efb69744d9e31d35997f4a205c0f1a0493 100644 (file)
--- a/libavfilter/asrc_sine.c
+++ b/libavfilter/asrc_sine.c
@@ -194,7 +194,7 @@ static av_cold int query_formats(AVFilterContext *ctx)
     if (ret < 0)
         return ret;
 
-    layouts = avfilter_make_format64_list(chlayouts);
+    layouts = ff_make_format64_list(chlayouts);
     if (!layouts)
         return AVERROR(ENOMEM);
     ret = ff_set_common_channel_layouts(ctx, layouts);

diff --git a/libavfilter/avf_showcqt.c b/libavfilter/avf_showcqt.c
index 990db3143b5d6407064b65978196bd39f89015b4..95efe72628f616db60eedb1d589f0eb01e565bcd 100644 (file)
--- a/libavfilter/avf_showcqt.c
+++ b/libavfilter/avf_showcqt.c
@@ -1334,7 +1334,7 @@ static int query_formats(AVFilterContext *ctx)
     if ((ret = ff_formats_ref(formats, &inlink->out_formats)) < 0)
         return ret;
 
-    layouts = avfilter_make_format64_list(channel_layouts);
+    layouts = ff_make_format64_list(channel_layouts);
     if ((ret = ff_channel_layouts_ref(layouts, &inlink->out_channel_layouts)) < 0)
         return ret;
 

diff --git a/libavfilter/formats.c b/libavfilter/formats.c
index bcc539bb38e7a69bb6b31e5550f87a552cb70387..48b27d0c53cb9390353893dd71b07aeaa2edf256 100644 (file)
--- a/libavfilter/formats.c
+++ b/libavfilter/formats.c
@@ -289,7 +289,7 @@ AVFilterFormats *ff_make_format_list(const int *fmts)
     return formats;
 }
 
-AVFilterChannelLayouts *avfilter_make_format64_list(const int64_t *fmts)
+AVFilterChannelLayouts *ff_make_format64_list(const int64_t *fmts)
 {
     MAKE_FORMAT_LIST(AVFilterChannelLayouts,
                      channel_layouts, nb_channel_layouts);
@@ -300,6 +300,13 @@ AVFilterChannelLayouts *avfilter_make_format64_list(const int64_t *fmts)
     return formats;
 }
 
+#if LIBAVFILTER_VERSION_MAJOR < 8
+AVFilterChannelLayouts *avfilter_make_format64_list(const int64_t *fmts)
+{
+    return ff_make_format64_list(fmts);
+}
+#endif
+
 #define ADD_FORMAT(f, fmt, unref_fn, type, list, nb)        \
 do {                                                        \
     type *fmts;                                             \

diff --git a/libavfilter/formats.h b/libavfilter/formats.h
index 708bee3ee80c6f14af99f5941d2c5d34d171d14b..ffe7a12d53f3e06a8ccca09057d8b090c8f59325 100644 (file)
--- a/libavfilter/formats.h
+++ b/libavfilter/formats.h
@@ -20,6 +20,7 @@
 #define AVFILTER_FORMATS_H
 
 #include "avfilter.h"
+#include "version.h"
 
 /**
  * A list of supported formats for one end of a filter link. This is used
@@ -139,8 +140,11 @@ av_warn_unused_result
 AVFilterChannelLayouts *ff_all_channel_counts(void);
 
 av_warn_unused_result
-AVFilterChannelLayouts *avfilter_make_format64_list(const int64_t *fmts);
+AVFilterChannelLayouts *ff_make_format64_list(const int64_t *fmts);
 
+#if LIBAVFILTER_VERSION_MAJOR < 8
+AVFilterChannelLayouts *avfilter_make_format64_list(const int64_t *fmts);
+#endif
 
 /**
  * A helper for query_formats() which sets all links to the same list of channel

diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c
index 476b8d3d967d8f751cfbb6c07b48fc891d574cc4..64d82e9df10f584525ba2996b1a3ec76947f7f27 100644 (file)
--- a/libavfilter/src_movie.c
+++ b/libavfilter/src_movie.c
@@ -376,7 +376,7 @@ static int movie_query_formats(AVFilterContext *ctx)
             if ((ret = ff_formats_ref(ff_make_format_list(list), &outlink->in_samplerates)) < 0)
                 return ret;
             list64[0] = c->channel_layout;
-            if ((ret = ff_channel_layouts_ref(avfilter_make_format64_list(list64),
+            if ((ret = ff_channel_layouts_ref(ff_make_format64_list(list64),
                                    &outlink->in_channel_layouts)) < 0)
                 return ret;
             break;