[MPlayer-cvslog] r22770 - in trunk: configure libmpcodecs/Makefile libmpcodecs/vf_bmovl.c

[diego]

Author: diego
Date: Wed Mar 21 09:29:46 2007
New Revision: 22770

Modified:
   trunk/configure
   trunk/libmpcodecs/Makefile
   trunk/libmpcodecs/vf_bmovl.c

Log:
Conditionally compile vf_bmovl.c instead of enclosing all of the file
in #ifdef HAVE_POSIX_SELECT.


Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Wed Mar 21 09:29:46 2007
@@ -7530,6 +7530,7 @@ HAVE_PTHREADS = $_pthreads
 HAVE_XVMC_ACCEL = $_xvmc
 
 HAVE_SYS_MMAN_H = $_mman
+HAVE_POSIX_SELECT = $_posix_select
 
 NEED_FSEEKO  = $_need_fseeko
 NEED_FTELLO  = $_need_ftello

Modified: trunk/libmpcodecs/Makefile
==============================================================================
--- trunk/libmpcodecs/Makefile	(original)
+++ trunk/libmpcodecs/Makefile	Wed Mar 21 09:29:46 2007
@@ -33,7 +33,6 @@ SRCS_COMMON = native/nuppelvideo.c \
               vf_1bpp.c \
               vf_2xsai.c \
               vf_blackframe.c \
-              vf_bmovl.c \
               vf_boxblur.c \
               vf_crop.c \
               vf_cropdetect.c \
@@ -108,6 +107,7 @@ SRCS_COMMON-$(CONFIG_LIBAVCODEC_SO)  += 
 SRCS_COMMON-$(CONFIG_LIBPOSTPROC)    += vf_pp.c
 SRCS_COMMON-$(CONFIG_LIBPOSTPROC_SO) += vf_pp.c
 SRCS_COMMON-$(FAAD)                  += ad_faad.c
+SRCS_COMMON-$(HAVE_POSIX_SELECT)     += vf_bmovl.c
 SRCS_COMMON-$(JPEG)                  += vd_ijpg.c
 SRCS_COMMON-$(LIBA52)                += ad_liba52.c
 SRCS_COMMON-$(LIBDV)                 += ad_libdv.c vd_libdv.c

Modified: trunk/libmpcodecs/vf_bmovl.c
==============================================================================
--- trunk/libmpcodecs/vf_bmovl.c	(original)
+++ trunk/libmpcodecs/vf_bmovl.c	Wed Mar 21 09:29:46 2007
@@ -68,8 +68,6 @@
 #include "vf.h"
 #include "img_format.h"
 
-#ifdef HAVE_POSIX_SELECT
-
 #include "mp_msg.h"
 #include "libavutil/common.h"
 
@@ -479,5 +477,3 @@ vf_info_t vf_info_bmovl = {
     vf_open,
     NULL
 };
-
-#endif