Mercurial > mplayer.hg

changeset 31699:04cbed442964

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not compile subassconvert.c if libass is disabled, the functionality is pointless in that case.
author reimar
date Wed, 21 Jul 2010 19:02:36 +0000
parents f1d69b608148
children 121fed0ab46a
files Makefile subreader.c
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Wed Jul 21 18:49:05 2010 +0000
+++ b/Makefile	Wed Jul 21 19:02:36 2010 +0000
@@ -108,6 +108,7 @@
 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 @@
               playtreeparser.c \
               spudec.c \
               sub_cc.c \
-              subassconvert.c \
               subopt-helper.c \
               subreader.c \
               vobsub.c \
--- a/subreader.c	Wed Jul 21 18:49:05 2010 +0000
+++ b/subreader.c	Wed Jul 21 19:02:36 2010 +0000
@@ -2380,6 +2380,11 @@
   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;