[Mplayer-cvslog] CVS: main/libvo Makefile, 1.45, 1.46 video_out.c, 1.90, 1.91 vo_pgm.c, 1.14, NONE vo_md5.c, 1.15, NONE

[Ivo van Poorten CVS]

CVS change done by Ivo van Poorten CVS

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

Modified Files:
	Makefile video_out.c 
Removed Files:
	vo_pgm.c vo_md5.c 
Log Message:

Removal of vo_pgm and vo_md5, because they have been replaced by vo_pnm
and vo_md5sum. If one tries to use the old video output drivers, a message
is printed to direct them to the new drivers.

Manual page is updated (or is this called downdated? :-) ).



Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/Makefile,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- Makefile	20 Sep 2004 01:35:43 -0000	1.45
+++ Makefile	29 Sep 2004 01:46:30 -0000	1.46
@@ -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 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 vo_pnm.c vo_md5sum.c md5sum.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.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- video_out.c	20 Sep 2004 01:35:43 -0000	1.90
+++ video_out.c	29 Sep 2004 01:46:30 -0000	1.91
@@ -76,8 +76,6 @@
 extern vo_functions_t video_out_zr;
 extern vo_functions_t video_out_zr2;
 extern vo_functions_t video_out_bl;
-extern vo_functions_t video_out_pgm;
-extern vo_functions_t video_out_md5;
 extern vo_functions_t video_out_syncfb;
 extern vo_functions_t video_out_fbdev;
 extern vo_functions_t video_out_fbdev2;
@@ -217,8 +215,6 @@
 #endif
         &video_out_null,
 //        &video_out_odivx,
-        &video_out_pgm,
-        &video_out_md5,
 	&video_out_mpegpes,
 	&video_out_yuv4mpeg,
 #ifdef HAVE_VESA
@@ -264,6 +260,10 @@
       while(vo_list[0][0]){
         char* vo=strdup(vo_list[0]);
 	vo_subdevice=strchr(vo,':');
+	if (!strcmp(vo, "pgm"))
+	    mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_VO_PGM_HasBeenReplaced);
+	if (!strcmp(vo, "md5"))
+	    mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_VO_MD5_HasBeenReplaced);
 	if(vo_subdevice){
 	    vo_subdevice[0]=0;
 	    ++vo_subdevice;

--- vo_pgm.c DELETED ---

--- vo_md5.c DELETED ---