[Mplayer-cvslog] CVS: main/libvo Makefile, 1.43, 1.44 video_out.c, 1.88, 1.89

[Ivo van Poorten CVS]

CVS change done by Ivo van Poorten CVS

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

Modified Files:
	Makefile video_out.c 
Log Message:

This patch enables the compilation and linking of vo_pnm (the portable
anymap video output driver) to libvo.



Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/Makefile,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- Makefile	24 Jun 2004 13:54:08 -0000	1.43
+++ Makefile	20 Sep 2004 01:31:26 -0000	1.44
@@ -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_pgm.c vo_md5.c vo_mpegpes.c vo_yuv4mpeg.c $(OPTIONAL_SRCS) sub.c font_load_ft.c
+SRCS=geometry.c aspect.c aclib.c osd.c font_load.c gtf.c spuenc.c video_out.c vo_null.c vo_pgm.c vo_md5.c vo_mpegpes.c vo_yuv4mpeg.c $(OPTIONAL_SRCS) sub.c font_load_ft.c vo_pnm.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.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- video_out.c	29 Jul 2004 14:59:00 -0000	1.88
+++ video_out.c	20 Sep 2004 01:31:26 -0000	1.89
@@ -124,6 +124,7 @@
 #ifdef MACOSX
 extern vo_functions_t video_out_quartz;
 #endif
+extern vo_functions_t video_out_pnm;
 
 vo_functions_t* video_out_drivers[] =
 {
@@ -240,6 +241,7 @@
 #ifdef HAVE_TGA
         &video_out_tga,
 #endif
+    &video_out_pnm,
         NULL
 };