lavfi: replace REGISTER_BUILTIN_FILTER() by REGISTER_FILTER_UNCONDITIONAL()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-12-29 15:37:05 +01:00
parent 83d4a8442c
commit 981baf742c

View File

@ -30,10 +30,6 @@
avfilter_register(&avfilter_##y##_##x); \ 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) \ #define REGISTER_FILTER_UNCONDITIONAL(x) \
{ \ { \
extern AVFilter avfilter_##x; \ extern AVFilter avfilter_##x; \
@ -169,11 +165,11 @@ void avfilter_register_all(void)
REGISTER_FILTER(AMOVIE, amovie, avsrc); REGISTER_FILTER(AMOVIE, amovie, avsrc);
REGISTER_FILTER(MOVIE, movie, avsrc); REGISTER_FILTER(MOVIE, movie, avsrc);
REGISTER_BUILTIN_FILTER (ffbuffersink, vsink); REGISTER_FILTER_UNCONDITIONAL(vsink_ffbuffersink);
REGISTER_BUILTIN_FILTER (ffabuffersink, asink); REGISTER_FILTER_UNCONDITIONAL(asink_ffabuffersink);
#if !AV_HAVE_INCOMPATIBLE_FORK_ABI #if !AV_HAVE_INCOMPATIBLE_FORK_ABI
REGISTER_BUILTIN_FILTER (buffersink, vsink); REGISTER_FILTER_UNCONDITIONAL(vsink_buffersink);
REGISTER_BUILTIN_FILTER (abuffersink, asink); REGISTER_FILTER_UNCONDITIONAL(asink_abuffersink);
#endif #endif
/* those filters are part of public or internal API => registered /* those filters are part of public or internal API => registered