# HG changeset patch
# User arpi
# Date 1016929933 0
# Node ID 4e64fca268e9fd2e81d5770c4ec56d4fcac74f7a
# Parent  fd992ece43679a99682bddf95b82236ccfcb95e0
moved font_laod.h

diff -r fd992ece4367 -r 4e64fca268e9 libvo/font_load.h
--- 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);
diff -r fd992ece4367 -r 4e64fca268e9 libvo/sub.c
--- 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>
diff -r fd992ece4367 -r 4e64fca268e9 libvo/sub.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;
diff -r fd992ece4367 -r 4e64fca268e9 libvo/video_out.h
--- 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"