Mercurial > mplayer.hg

changeset 33852:3b2c18ccfda2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change code so that it compiles more reliably without libass instead of relying on compiler optimization.
author reimar
date Sat, 30 Jul 2011 10:43:38 +0000
parents ebc24527c63f
children 4b0394235050
files sub/subreader.c
diffstat 1 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/sub/subreader.c	Sat Jul 30 10:29:14 2011 +0000
+++ b/sub/subreader.c	Sat Jul 30 10:43:38 2011 +0000
@@ -2515,15 +2515,16 @@
   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;