[Mplayer-cvslog] CVS: main/libvo font_load.h,1.6,1.7 sub.c,1.43,1.44 sub.h,1.11,1.12 video_out.h,1.27,1.28

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libvo
In directory mplayer:/var/tmp.root/cvs-serv16026

Modified Files:
	font_load.h sub.c sub.h video_out.h 
Log Message:
moved font_laod.h

Index: font_load.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/font_load.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- font_load.h	20 Jul 2001 00:01:09 -0000	1.6
+++ font_load.h	24 Mar 2002 00:32:13 -0000	1.7
@@ -20,5 +20,7 @@
     short width[65536];
 } font_desc_t;
 
+extern font_desc_t* vo_font;
+
 raw_file* load_raw(char *name,int verbose);
 font_desc_t* read_font_desc(char* fname,float factor,int verbose);

Index: sub.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/sub.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sub.c	22 Feb 2002 15:25:11 -0000	1.43
+++ sub.c	24 Mar 2002 00:32:13 -0000	1.44
@@ -1,6 +1,7 @@
 
 #include "config.h"
 #include "video_out.h"
+#include "font_load.h"
 #include "sub.h"
 
 #include <stdlib.h>

Index: sub.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/sub.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sub.h	22 Feb 2002 15:25:11 -0000	1.11
+++ sub.h	24 Mar 2002 00:32:13 -0000	1.12
@@ -12,8 +12,6 @@
 
 #include "../subreader.h"
 
-extern font_desc_t* vo_font;
-
 extern unsigned char* vo_osd_text;
 
 extern int vo_osd_progbar_type;

Index: video_out.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/video_out.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- video_out.h	9 Mar 2002 17:27:37 -0000	1.27
+++ video_out.h	24 Mar 2002 00:32:13 -0000	1.28
@@ -12,7 +12,7 @@
 #include <inttypes.h>
 #include <stdarg.h>
 
-#include "font_load.h"
+//#include "font_load.h"
 #include "img_format.h"
 #include "../vidix/vidix.h"