[MPlayer-dev-eng] [PATCH] fix mplayer build when ass disabled

[Andrew Wason]

Building mplayer with configure --disable-ass --disable-ass-internal
is failing as of r31752

Undefined symbols:
  "_ass_enabled", referenced from:
      _sub_read_line_microdvd in subreader.o
      _sub_read_line_subviewer in subreader.o
ld: symbol(s) not found
collect2: ld returned 1 exit status
make: *** [mplayer] Error 1

I think the references to ass_enabled in subreader.c added by r31752
need to be conditional on CONFIG_ASS, see attached patch.

Andrew
-------------- next part --------------
Index: subreader.c
===================================================================
--- subreader.c	(revision 31760)
+++ subreader.c	(working copy)
@@ -298,10 +298,12 @@
 		      "{%ld}{%ld}%[^\r\n]",
 		      &(current->start), &(current->end), line2) < 3));
 
+#ifdef CONFIG_ASS
     if (ass_enabled) {
         subassconvert_microdvd(line2, line, LINE_LEN + 1);
         p = line;
     } else
+#endif
         p = line2;
 
     next=p, i=0;
@@ -433,8 +435,10 @@
     char *p=NULL;
     int i,len;
 
+#ifdef CONFIG_ASS
     if (ass_enabled)
         return sub_ass_read_line_subviewer(st, current, utf16);
+#endif
     while (!current->text[0]) {
 	if (!stream_read_line (st, line, LINE_LEN, utf16)) return NULL;
 	if ((len=sscanf (line, "%d:%d:%d%[,.:]%d --> %d:%d:%d%[,.:]%d",&a1,&a2,&a3,(char *)&i,&a4,&b1,&b2,&b3,(char *)&i,&b4)) < 10)