# HG changeset patch # User greg # Date 1279734666 0 # Node ID 8f7554cf44410420c0be750c577f1a6cb830ac45 # Parent e251996735b5a2922dd0f4939af1e3f7b86c7e68 subtitles: fix build without libass Conditionally use ass_enabled to unbreak build with libass support disabled; this problems was introduced with r31752. Patch by Andrew Wason, rectalogic AT rectalogic DOT com. diff -r e251996735b5 -r 8f7554cf4441 subreader.c --- a/subreader.c Wed Jul 21 13:29:55 2010 +0000 +++ b/subreader.c Wed Jul 21 17:51:06 2010 +0000 @@ -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)