[MPlayer-cvslog] r32098 - in trunk: libass/ass_mp.c libvo/sub.h subreader.h

[diego]

Author: diego
Date: Wed Sep  8 21:26:42 2010
New Revision: 32098

Log:
Move sub_cp extern declaration to subreader.h, where it belongs.

Modified:
   trunk/libass/ass_mp.c
   trunk/libvo/sub.h
   trunk/subreader.h

Modified: trunk/libass/ass_mp.c
==============================================================================
--- trunk/libass/ass_mp.c	Wed Sep  8 21:18:59 2010	(r32097)
+++ trunk/libass/ass_mp.c	Wed Sep  8 21:26:42 2010	(r32098)
@@ -65,7 +65,7 @@ extern float text_font_scale_factor;
 extern int subtitle_autoscale;
 
 #ifdef CONFIG_ICONV
-extern char* sub_cp;
+#include "subreader.h"
 #else
 static char* sub_cp = 0;
 #endif

Modified: trunk/libvo/sub.h
==============================================================================
--- trunk/libvo/sub.h	Wed Sep  8 21:18:59 2010	(r32097)
+++ trunk/libvo/sub.h	Wed Sep  8 21:26:42 2010	(r32098)
@@ -113,7 +113,6 @@ extern char * sub_osd_names_short[];
 extern int sub_unicode;
 extern int sub_utf8;
 
-extern char *sub_cp;
 extern int sub_pos;
 extern int sub_width_p;
 extern int sub_alignment;

Modified: trunk/subreader.h
==============================================================================
--- trunk/subreader.h	Wed Sep  8 21:18:59 2010	(r32097)
+++ trunk/subreader.h	Wed Sep  8 21:26:42 2010	(r32098)
@@ -27,6 +27,7 @@ extern int suboverlap_enabled;
 extern int sub_no_text_pp;  // disable text post-processing
 extern int sub_match_fuzziness;
 extern int sub_format;
+extern char *sub_cp;
 
 // subtitle formats
 #define SUB_INVALID   -1