diff options
| author | Vitor Sessak <vitor1001@gmail.com> | 2008-03-03 20:53:15 +0000 |
|---|---|---|
| committer | Vitor Sessak <vitor1001@gmail.com> | 2008-03-03 20:53:15 +0000 |
| commit | 81124ba0d14a2a86ec555a29d4cd8cc97b84fa13 (patch) | |
| tree | 758c47c28e72ac2b730caa1e054b0920f9875c9c /libavfilter | |
| parent | f15e6b869fc1ff3ffef1b1ac7b394e2155b5fafe (diff) | |
Fix libavfilter compilation and make it more in line
with the other libav*.
Originally committed as revision 12301 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/Makefile | 2 | ||||
| -rw-r--r-- | libavfilter/allfilters.c | 12 |
2 files changed, 5 insertions, 9 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile index ab6c6b7960..38f5a2c874 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -7,7 +7,7 @@ OBJS = allfilters.o \ defaults.o \ formats.o \ -#OBJS-$(CONFIG_VF_XXXX) += vf_xxx.o +#OBJS-$(CONFIG_XXX_FILTER) += vf_xxx.o HEADERS = avfilter.h diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index fafd6d1c62..8ea052805c 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -21,14 +21,10 @@ #include "avfilter.h" -#define REGISTER_VF(X,x) { \ - extern AVFilter avfilter_vf_##x ; \ - if(ENABLE_VF_##X ) avfilter_register(&avfilter_vf_##x ); } - -#define REGISTER_VSRC(X,x) { \ - extern AVFilter avfilter_vsrc_##x ; \ - if(ENABLE_VSRC_##X ) avfilter_register(&avfilter_vsrc_##x ); } +#define REGISTER_FILTER(X,x,y) { \ + extern AVFilter avfilter_##y##_##x ; \ + if(ENABLE_##X##_FILTER ) avfilter_register(&avfilter_##y##_##x ); } void avfilter_register_all(void) { @@ -38,6 +34,6 @@ void avfilter_register_all(void) return; initialized = 1; -// REGISTER_VF(CROP,crop); +// REGISTER_FILTER (CROP,crop,vf); } |