From 981baf742ce632a4df311a12a495ffe499ee4df6 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 29 Dec 2012 15:37:05 +0100 Subject: [PATCH] lavfi: replace REGISTER_BUILTIN_FILTER() by REGISTER_FILTER_UNCONDITIONAL() Signed-off-by: Michael Niedermayer --- libavfilter/allfilters.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 111deac249..4458917822 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -30,10 +30,6 @@ avfilter_register(&avfilter_##y##_##x); \ } -#define REGISTER_BUILTIN_FILTER(x,y) { \ - extern AVFilter avfilter_##y##_##x ; \ - avfilter_register(&avfilter_##y##_##x ); } - #define REGISTER_FILTER_UNCONDITIONAL(x) \ { \ extern AVFilter avfilter_##x; \ @@ -169,11 +165,11 @@ void avfilter_register_all(void) REGISTER_FILTER(AMOVIE, amovie, avsrc); REGISTER_FILTER(MOVIE, movie, avsrc); - REGISTER_BUILTIN_FILTER (ffbuffersink, vsink); - REGISTER_BUILTIN_FILTER (ffabuffersink, asink); + REGISTER_FILTER_UNCONDITIONAL(vsink_ffbuffersink); + REGISTER_FILTER_UNCONDITIONAL(asink_ffabuffersink); #if !AV_HAVE_INCOMPATIBLE_FORK_ABI - REGISTER_BUILTIN_FILTER (buffersink, vsink); - REGISTER_BUILTIN_FILTER (abuffersink, asink); + REGISTER_FILTER_UNCONDITIONAL(vsink_buffersink); + REGISTER_FILTER_UNCONDITIONAL(asink_abuffersink); #endif /* those filters are part of public or internal API => registered