Mercurial > mplayer.hg

changeset 32195:25bb8d59af90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Unconditionally #include subreader.h. This fixes compilation with iconv disabled.
author diego
date Thu, 16 Sep 2010 19:19:13 +0000
parents 26f7bcb5fd7f
children 56ce48514a75
files libass/ass_mp.c
diffstat 1 files changed, 1 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/libass/ass_mp.c	Thu Sep 16 18:58:21 2010 +0000
+++ b/libass/ass_mp.c	Thu Sep 16 19:19:13 2010 +0000
@@ -25,6 +25,7 @@
 #include "mp_msg.h"
 #include "mpcommon.h"
 #include "path.h"
+#include "subreader.h"
 
 #include "ass_mp.h"
 #include "help_mp.h"
@@ -50,12 +51,6 @@
 char* ass_styles_file = NULL;
 int ass_hinting = ASS_HINTING_NATIVE + 4; // native hinting for unscaled osd
 
-#ifdef CONFIG_ICONV
-#include "subreader.h"
-#else
-static char* sub_cp = 0;
-#endif
-
 ASS_Track* ass_default_track(ASS_Library* library) {
 	ASS_Track* track = ass_new_track(library);