Mercurial > mplayer.hg

changeset 5294:4e64fca268e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
moved font_laod.h
author arpi
date Sun, 24 Mar 2002 00:32:13 +0000
parents fd992ece4367
children 302fe25185c4
files libvo/font_load.h libvo/sub.c libvo/sub.h libvo/video_out.h
diffstat 4 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/font_load.h	Sat Mar 23 22:50:25 2002 +0000
+++ b/libvo/font_load.h	Sun Mar 24 00:32:13 2002 +0000
@@ -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);
--- a/libvo/sub.c	Sat Mar 23 22:50:25 2002 +0000
+++ b/libvo/sub.c	Sun Mar 24 00:32:13 2002 +0000
@@ -1,6 +1,7 @@
 
 #include "config.h"
 #include "video_out.h"
+#include "font_load.h"
 #include "sub.h"
 
 #include <stdlib.h>
--- a/libvo/sub.h	Sat Mar 23 22:50:25 2002 +0000
+++ b/libvo/sub.h	Sun Mar 24 00:32:13 2002 +0000
@@ -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;
--- a/libvo/video_out.h	Sat Mar 23 22:50:25 2002 +0000
+++ b/libvo/video_out.h	Sun Mar 24 00:32:13 2002 +0000
@@ -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"