Mercurial > mplayer.hg
comparison subreader.c @ 31699:04cbed442964
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 | 8d65df40de82 |
| children | c3775dbb8509 |
comparison
equal
deleted
inserted
replaced
| 31698:f1d69b608148 | 31699:04cbed442964 |
|---|---|
| 2378 pos = 0; | 2378 pos = 0; |
| 2379 buf = malloc(MAX_SUBLINE + 1); | 2379 buf = malloc(MAX_SUBLINE + 1); |
| 2380 sub->text[sub->lines] = buf; | 2380 sub->text[sub->lines] = buf; |
| 2381 sub->endpts[sub->lines] = endpts; | 2381 sub->endpts[sub->lines] = endpts; |
| 2382 | 2382 |
| 2383 #ifndef CONFIG_ASS | |
| 2384 if (!strip_markup) | |
| 2385 mp_msg(MSGT_SUBREADER, MSGL_ERR, "strip_markup must be set when ASS support is disabled!\n"); | |
| 2386 strip_markup = 1; | |
| 2387 #endif | |
| 2383 if (!strip_markup) { | 2388 if (!strip_markup) { |
| 2384 subassconvert_subrip(txt, buf, MAX_SUBLINE + 1); | 2389 subassconvert_subrip(txt, buf, MAX_SUBLINE + 1); |
| 2385 sub->text[sub->lines] = buf; | 2390 sub->text[sub->lines] = buf; |
| 2386 } else { | 2391 } else { |
| 2387 for (i = 0; i < len && pos < MAX_SUBLINE; i++) { | 2392 for (i = 0; i < len && pos < MAX_SUBLINE; i++) { |