Mercurial > mplayer.hg

changeset 32014:960f3f35ebda

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move sub_cp extern declaration to subreader.h, where it belongs.
author diego
date Wed, 08 Sep 2010 19:26:42 +0000
parents 7369969407d6
children c6a2fbf92fc3
files libass/ass_mp.c libvo/sub.h subreader.h
diffstat 3 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libass/ass_mp.c	Wed Sep 08 19:18:59 2010 +0000
+++ b/libass/ass_mp.c	Wed Sep 08 19:26:42 2010 +0000
@@ -65,7 +65,7 @@
 extern int subtitle_autoscale;
 
 #ifdef CONFIG_ICONV
-extern char* sub_cp;
+#include "subreader.h"
 #else
 static char* sub_cp = 0;
 #endif
--- a/libvo/sub.h	Wed Sep 08 19:18:59 2010 +0000
+++ b/libvo/sub.h	Wed Sep 08 19:26:42 2010 +0000
@@ -113,7 +113,6 @@
 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;
--- a/subreader.h	Wed Sep 08 19:18:59 2010 +0000
+++ b/subreader.h	Wed Sep 08 19:26:42 2010 +0000
@@ -27,6 +27,7 @@
 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