Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

[ffmpeg] / libavfilter / formats.c

diff --git a/libavfilter/formats.c b/libavfilter/formats.c
index c23f24d6d37242f104e24db9943c4605a6a1b4eb..62facc6634959e3aaf8521c5dd33ff534d8a1542 100644 (file)
--- a/libavfilter/formats.c
+++ b/libavfilter/formats.c
@@ -285,19 +285,6 @@ const int64_t avfilter_all_channel_layouts[] = {
 //     return avfilter_make_format64_list(avfilter_all_channel_layouts);
 // }
 
-#if FF_API_PACKING
-AVFilterFormats *avfilter_make_all_packing_formats(void)
-{
-    static const int packing[] = {
-        AVFILTER_PACKED,
-        AVFILTER_PLANAR,
-        -1,
-    };
-
-    return ff_make_format_list(packing);
-}
-#endif
-
 AVFilterFormats *ff_planar_sample_fmts(void)
 {
     AVFilterFormats *ret = NULL;
@@ -538,45 +525,6 @@ int ff_parse_channel_layout(int64_t *ret, const char *arg, void *log_ctx)
     return 0;
 }
 
-#if FF_API_FILTERS_PUBLIC
-int avfilter_default_query_formats(AVFilterContext *ctx)
-{
-    return ff_default_query_formats(ctx);
-}
-void avfilter_set_common_formats(AVFilterContext *ctx, AVFilterFormats *formats)
-{
-    ff_set_common_formats(ctx, formats);
-}
-AVFilterFormats *avfilter_make_format_list(const int *fmts)
-{
-    return ff_make_format_list(fmts);
-}
-int avfilter_add_format(AVFilterFormats **avff, int64_t fmt)
-{
-    return ff_add_format(avff, fmt);
-}
-AVFilterFormats *avfilter_all_formats(enum AVMediaType type)
-{
-    return ff_all_formats(type);
-}
-AVFilterFormats *avfilter_merge_formats(AVFilterFormats *a, AVFilterFormats *b)
-{
-    return ff_merge_formats(a, b);
-}
-void avfilter_formats_ref(AVFilterFormats *f, AVFilterFormats **ref)
-{
-    ff_formats_ref(f, ref);
-}
-void avfilter_formats_unref(AVFilterFormats **ref)
-{
-    ff_formats_unref(ref);
-}
-void avfilter_formats_changeref(AVFilterFormats **oldref,
-                                AVFilterFormats **newref)
-{
-    ff_formats_changeref(oldref, newref);
-}
-#endif
 #ifdef TEST
 
 #undef printf
@@ -595,3 +543,4 @@ int main(void)
 }
 
 #endif
+