Mercurial > mplayer.hg
comparison subreader.c @ 31697:8d65df40de82
Put sub_ass_read_line_subviewer under CONFIG_ASS to avoid a warning.
| author | reimar |
|---|---|
| date | Wed, 21 Jul 2010 18:48:13 +0000 |
| parents | 8f7554cf4441 |
| children | 04cbed442964 |
comparison
equal
deleted
inserted
replaced
| 31696:275c509b9c33 | 31697:8d65df40de82 |
|---|---|
| 371 break; | 371 break; |
| 372 } | 372 } |
| 373 return current; | 373 return current; |
| 374 } | 374 } |
| 375 | 375 |
| 376 #ifdef CONFIG_ASS | |
| 376 static subtitle *sub_ass_read_line_subviewer(stream_t *st, subtitle *current, int utf16) | 377 static subtitle *sub_ass_read_line_subviewer(stream_t *st, subtitle *current, int utf16) |
| 377 { | 378 { |
| 378 int h1, m1, s1, ms1, h2, m2, s2, ms2, j = 0; | 379 int h1, m1, s1, ms1, h2, m2, s2, ms2, j = 0; |
| 379 | 380 |
| 380 while (!current->text[0]) { | 381 while (!current->text[0]) { |
| 426 current->lines = 1; | 427 current->lines = 1; |
| 427 } | 428 } |
| 428 } | 429 } |
| 429 return current; | 430 return current; |
| 430 } | 431 } |
| 432 #endif | |
| 431 | 433 |
| 432 static subtitle *sub_read_line_subviewer(stream_t *st,subtitle *current, int utf16) { | 434 static subtitle *sub_read_line_subviewer(stream_t *st,subtitle *current, int utf16) { |
| 433 char line[LINE_LEN+1]; | 435 char line[LINE_LEN+1]; |
| 434 int a1,a2,a3,a4,b1,b2,b3,b4; | 436 int a1,a2,a3,a4,b1,b2,b3,b4; |
| 435 char *p=NULL; | 437 char *p=NULL; |