[MPlayer-cvslog] r32279 - trunk/libass/ass_mp.c

[diego]

Author: diego
Date: Thu Sep 16 21:19:13 2010
New Revision: 32279

Log:
Unconditionally #include subreader.h.
This fixes compilation with iconv disabled.

Modified:
   trunk/libass/ass_mp.c

Modified: trunk/libass/ass_mp.c
==============================================================================
--- trunk/libass/ass_mp.c	Thu Sep 16 20:58:21 2010	(r32278)
+++ trunk/libass/ass_mp.c	Thu Sep 16 21:19:13 2010	(r32279)
@@ -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_border_color = NULL;
 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);