diff subreader.c @ 31489:dc26022e9c27

Clean up sub-related extern declarations. - Move sub_delay and sub_fps declarations to mpcommon.h. - Remove redundant ass_track extern declaration. - Add #include for sub_utf8 extern declaration.
author diego
date Thu, 24 Jun 2010 17:19:49 +0000
parents 91b713df588f
children b41cbf02f854
line wrap: on
line diff
--- a/subreader.c	Thu Jun 24 16:50:47 2010 +0000
+++ b/subreader.c	Thu Jun 24 17:19:49 2010 +0000
@@ -31,7 +31,9 @@
 
 #include "config.h"
 #include "mp_msg.h"
+#include "mpcommon.h"
 #include "subreader.h"
+#include "libvo/sub.h"
 #include "stream/stream.h"
 #include "libavutil/common.h"
 #include "libavutil/avstring.h"
@@ -1085,12 +1087,8 @@
     return SUB_INVALID;  // too many bad lines
 }
 
-extern int sub_utf8;
 int sub_utf8_prev=0;
 
-extern float sub_delay;
-extern float sub_fps;
-
 #ifdef CONFIG_ICONV
 static iconv_t icdsc = (iconv_t)(-1);