[Mplayer-cvslog] CVS: main/libvo Makefile, 1.46, 1.47 video_out.c, 1.92, 1.93

[Ivo van Poorten CVS]

CVS change done by Ivo van Poorten CVS

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

Modified Files:
	Makefile video_out.c 
Log Message:
Add --enable and --disable options for vo_pnm and vo_md5sum to configure.
It's now possible to compile libvo without pnm and/or md5sum support.
Default is enable.



Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/Makefile,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- Makefile	29 Sep 2004 01:46:30 -0000	1.46
+++ Makefile	23 Oct 2004 22:43:19 -0000	1.47
@@ -3,7 +3,7 @@
 
 LIBNAME = libvo.a
 
-SRCS=geometry.c aspect.c aclib.c osd.c font_load.c gtf.c spuenc.c video_out.c vo_null.c vo_mpegpes.c vo_yuv4mpeg.c $(OPTIONAL_SRCS) sub.c font_load_ft.c vo_pnm.c vo_md5sum.c md5sum.c
+SRCS=geometry.c aspect.c aclib.c osd.c font_load.c gtf.c spuenc.c video_out.c vo_null.c vo_mpegpes.c vo_yuv4mpeg.c $(OPTIONAL_SRCS) sub.c font_load_ft.c
 OBJS=$(SRCS:.c=.o)
 
 ifeq ($(VIDIX),yes)

Index: video_out.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/video_out.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- video_out.c	4 Oct 2004 19:36:12 -0000	1.92
+++ video_out.c	23 Oct 2004 22:43:19 -0000	1.93
@@ -122,8 +122,12 @@
 #ifdef MACOSX
 extern vo_functions_t video_out_quartz;
 #endif
+#ifdef HAVE_PNM
 extern vo_functions_t video_out_pnm;
+#endif
+#ifdef HAVE_MD5SUM
 extern vo_functions_t video_out_md5sum;
+#endif
 
 vo_functions_t* video_out_drivers[] =
 {
@@ -237,8 +241,12 @@
 #ifdef HAVE_TGA
         &video_out_tga,
 #endif
+#ifdef HAVE_PNM
     &video_out_pnm,
+#endif
+#ifdef HAVE_MD5SUM
     &video_out_md5sum,
+#endif
         NULL
 };