Mercurial > mplayer.hg
changeset 31695:8f7554cf4441
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.
| author | greg |
|---|---|
| date | Wed, 21 Jul 2010 17:51:06 +0000 |
| parents | e251996735b5 |
| children | 275c509b9c33 |
| files | subreader.c |
| diffstat | 1 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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)