[MPlayer-cvslog] r31765 - in trunk: Makefile subreader.c

[reimar]

Author: reimar
Date: Wed Jul 21 21:02:36 2010
New Revision: 31765

Log:
Do not compile subassconvert.c if libass is disabled, the functionality
is pointless in that case.

Modified:
   trunk/Makefile
   trunk/subreader.c

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Wed Jul 21 20:49:05 2010	(r31764)
+++ trunk/Makefile	Wed Jul 21 21:02:36 2010	(r31765)
@@ -108,6 +108,7 @@ SRCS_COMMON-$(LADSPA)                += 
 SRCS_COMMON-$(LIBA52)                += libmpcodecs/ad_liba52.c
 SRCS_COMMON-$(LIBASS)                += libmpcodecs/vf_ass.c \
                                         libass/ass_mp.c \
+                                        subassconvert.c \
 
 SRCS_COMMON-$(LIBASS_INTERNAL)       += libass/ass.c \
                                         libass/ass_bitmap.c \
@@ -347,7 +348,6 @@ SRCS_COMMON = asxparser.c \
               playtreeparser.c \
               spudec.c \
               sub_cc.c \
-              subassconvert.c \
               subopt-helper.c \
               subreader.c \
               vobsub.c \

Modified: trunk/subreader.c
==============================================================================
--- trunk/subreader.c	Wed Jul 21 20:49:05 2010	(r31764)
+++ trunk/subreader.c	Wed Jul 21 21:02:36 2010	(r31765)
@@ -2380,6 +2380,11 @@ 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) {
     subassconvert_subrip(txt, buf, MAX_SUBLINE + 1);
     sub->text[sub->lines] = buf;