[MPlayer-cvslog] r33940 - trunk/sub/subreader.c

[reimar]

Author: reimar
Date: Sat Jul 30 12:43:38 2011
New Revision: 33940

Log:
Change code so that it compiles more reliably without libass
instead of relying on compiler optimization.

Modified:
   trunk/sub/subreader.c

Modified: trunk/sub/subreader.c
==============================================================================
--- trunk/sub/subreader.c	Sat Jul 30 12:29:14 2011	(r33939)
+++ trunk/sub/subreader.c	Sat Jul 30 12:43:38 2011	(r33940)
@@ -2515,15 +2515,16 @@ void sub_add_text(subtitle *sub, const c
   sub->text[sub->lines] = buf;
   sub->endpts[sub->lines] = endpts;
 
-#ifndef CONFIG_ASS
-  if (!strip_markup)
-    mp_msg(MSGT_SUBREADER, MSGL_ERR, "strip_markup must be set when ASS support is disabled!\n");
-  strip_markup = 1;
-#endif
   if (!strip_markup) {
+#ifdef CONFIG_ASS
     subassconvert_subrip(txt, buf, MAX_SUBLINE + 1);
     sub->text[sub->lines] = buf;
-  } else {
+#else
+    mp_msg(MSGT_SUBREADER, MSGL_ERR, "strip_markup must be set when ASS support is disabled!\n");
+    strip_markup = 1;
+#endif
+  }
+  if (strip_markup) {
     for (i = 0; i < len && pos < MAX_SUBLINE; i++) {
       char c = txt[i];
       if (c == '<') comment |= 1;