[MPlayer-cvslog] CVS: main/libvo Makefile, 1.53, 1.54 vosub_vidix.c, 1.66, 1.67

[Nico Sabbi CVS]

CVS change done by Nico Sabbi CVS

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv16384/libvo

Modified Files:
	Makefile vosub_vidix.c 
Log Message:
added support for external VIDIX

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/Makefile,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- Makefile	27 Jan 2006 00:06:39 -0000	1.53
+++ Makefile	28 Mar 2006 22:44:16 -0000	1.54
@@ -29,6 +29,10 @@
 SRCS += vosub_vidix.c
 endif
 
+ifeq ($(EXTERNAL_VIDIX),yes)
+SRCS += vosub_vidix.c
+endif
+
 CFLAGS  = $(OPTFLAGS) -I. -I.. -I../osdep \
           $(LIBAV_INC) \
           $(FREETYPE_INC) \

Index: vosub_vidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vosub_vidix.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- vosub_vidix.c	24 Mar 2006 08:12:02 -0000	1.66
+++ vosub_vidix.c	28 Mar 2006 22:44:16 -0000	1.67
@@ -716,7 +716,7 @@
 	  return -1;
 	}
 #ifndef __MINGW32__
-	vidix_handler = vdlOpen(MPLAYER_LIBDIR "/mplayer/vidix/",
+	vidix_handler = vdlOpen(MP_VIDIX_PFX,
 				drvname ? drvname[0] == ':' ? &drvname[1] : drvname[0] ? drvname : NULL : NULL,
 				TYPE_OUTPUT,
 				verbose);