Author: vitor Date: Mon Mar 3 22:03:12 2008 New Revision: 1952 Log: Update to main tree build system changes Modified: libavfilter/Makefile libavfilter/allfilters.c Modified: libavfilter/Makefile ============================================================================== --- libavfilter/Makefile (original) +++ libavfilter/Makefile Mon Mar 3 22:03:12 2008 @@ -10,25 +10,24 @@ OBJS = allfilters.o \ formats.o \ avfiltergraphfile.o \ -# TODO: real conditional compilation +OBJS-$(CONFIG_CROP_FILTER) += vf_crop.o +OBJS-$(CONFIG_DRAWBOX_FILTER) += vf_drawbox.o +OBJS-$(CONFIG_FPS_FILTER) += vf_fps.o +OBJS-$(CONFIG_HFLIP_FILTER) += vf_hflip.o +OBJS-$(CONFIG_NEGATE_FILTER) += vf_negate.o +OBJS-$(CONFIG_FIFO_FILTER) += vf_fifo.o +OBJS-$(CONFIG_FORMAT_FILTER) += vf_format.o +OBJS-$(CONFIG_OVERLAY_FILTER) += vf_overlay.o +OBJS-$(CONFIG_ROTATE_FILTER) += vf_rotate.o +OBJS-$(CONFIG_SCALE_FILTER) += vf_scale.o +OBJS-$(CONFIG_SETPTS_FILTER) += vf_setpts.o +OBJS-$(CONFIG_SLICIFY_FILTER) += vf_slicify.o +OBJS-$(CONFIG_SPLIT_FILTER) += vf_split.o +OBJS-$(CONFIG_TRANSPOSE_FILTER) += vf_transpose.o +OBJS-$(CONFIG_VFLIP_FILTER) += vf_vflip.o -OBJS-$(CONFIG_VF_CROP) += vf_crop.o -OBJS-$(CONFIG_VF_DRAWBOX) += vf_drawbox.o -OBJS-$(CONFIG_VF_FPS) += vf_fps.o -OBJS-$(CONFIG_VF_HFLIP) += vf_hflip.o -OBJS-$(CONFIG_VF_NEGATE) += vf_negate.o -OBJS-$(CONFIG_VF_FIFO) += vf_fifo.o -OBJS-$(CONFIG_VF_FORMAT) += vf_format.o -OBJS-$(CONFIG_VF_OVERLAY) += vf_overlay.o -OBJS-$(CONFIG_VF_ROTATE) += vf_rotate.o -OBJS-$(CONFIG_VF_SCALE) += vf_scale.o -OBJS-$(CONFIG_VF_SETPTS) += vf_setpts.o -OBJS-$(CONFIG_VF_SLICIFY) += vf_slicify.o -OBJS-$(CONFIG_VF_SPLIT) += vf_split.o -OBJS-$(CONFIG_VF_TRANSPOSE) += vf_transpose.o -OBJS-$(CONFIG_VF_VFLIP) += vf_vflip.o -OBJS-$(CONFIG_VSRC_MOVIE) += vsrc_movie.o +OBJS-$(CONFIG_MOVIE_FILTER) += vsrc_movie.o HEADERS = avfilter.h Modified: libavfilter/allfilters.c ============================================================================== --- libavfilter/allfilters.c (original) +++ libavfilter/allfilters.c Mon Mar 3 22:03:12 2008 @@ -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,25 +34,25 @@ void avfilter_register_all(void) return; initialized = 1; - REGISTER_VF(CROP,crop); - REGISTER_VF(DRAWBOX,drawbox); - REGISTER_VF(FIFO,fifo); - REGISTER_VF(FORMAT,format); - REGISTER_VF(FPS,fps); - REGISTER_VF(GRAPH,graph); - REGISTER_VF(GRAPHDESC,graphdesc); - REGISTER_VF(GRAPHFILE,graphfile); - REGISTER_VF(HFLIP,hflip); - REGISTER_VF(NEGATE,negate); - REGISTER_VF(NOFORMAT,noformat); - REGISTER_VF(OVERLAY,overlay); - REGISTER_VF(ROTATE,rotate); - REGISTER_VF(SCALE,scale); - REGISTER_VF(SETPTS,setpts); - REGISTER_VF(SLICIFY,slicify); - REGISTER_VF(SPLIT,split); - REGISTER_VF(TRANSPOSE,transpose); - REGISTER_VF(VFLIP,vflip); + REGISTER_FILTER(CROP,crop,vf); + REGISTER_FILTER(DRAWBOX,drawbox,vf); + REGISTER_FILTER(FIFO,fifo,vf); + REGISTER_FILTER(FORMAT,format,vf); + REGISTER_FILTER(FPS,fps,vf); + REGISTER_FILTER(GRAPH,graph,vf); + REGISTER_FILTER(GRAPHDESC,graphdesc,vf); + REGISTER_FILTER(GRAPHFILE,graphfile,vf); + REGISTER_FILTER(HFLIP,hflip,vf); + REGISTER_FILTER(NEGATE,negate,vf); + REGISTER_FILTER(NOFORMAT,noformat,vf); + REGISTER_FILTER(OVERLAY,overlay,vf); + REGISTER_FILTER(ROTATE,rotate,vf); + REGISTER_FILTER(SCALE,scale,vf); + REGISTER_FILTER(SETPTS,setpts,vf); + REGISTER_FILTER(SLICIFY,slicify,vf); + REGISTER_FILTER(SPLIT,split,vf); + REGISTER_FILTER(TRANSPOSE,transpose,vf); + REGISTER_FILTER(VFLIP,vflip,vf); - REGISTER_VSRC(MOVIE,movie); + REGISTER_FILTER(MOVIE,movie,vsrc); }