[MPlayer-cvslog] r23086 - in trunk: configure libvo/Makefile

[diego]

Author: diego
Date: Sun Apr 22 22:19:00 2007
New Revision: 23086

Log:
Add Makefile variable for either internal or external VIDIX.


Modified:
   trunk/configure
   trunk/libvo/Makefile

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Sun Apr 22 22:19:00 2007
@@ -7666,8 +7666,9 @@ STREAMING_LIVE555 = $_live
 VSTREAM = $_vstream
 STREAM_CACHE = $_stream_cache
 DVBIN = $_dvbin
-VIDIX = $_vidix_internal
-EXTERNAL_VIDIX = $_vidix_external
+VIDIX = $_vidix
+VIDIX_INTERNAL = $_vidix_internal
+VIDIX_EXTERNAL = $_vidix_external
 CONFIG_PP = yes
 MP3LAME = $_mp3lame
 LIBMENU = $_menu

Modified: trunk/libvo/Makefile
==============================================================================
--- trunk/libvo/Makefile	(original)
+++ trunk/libvo/Makefile	Sun Apr 22 22:19:00 2007
@@ -12,7 +12,6 @@ SRCS_MPLAYER = aspect.c \
                vo_yuv4mpeg.c \
                $(VO_SRCS) \
 
-SRCS_MPLAYER-$(EXTERNAL_VIDIX) +=  vosub_vidix.c
 SRCS_MPLAYER-$(VIDIX)          +=  vosub_vidix.c
 
 SRCS_COMMON = aclib.c \