diff options
| author | Grigori Goronzy <greg@kinoho.net> | 2014-01-24 16:38:11 -0800 |
|---|---|---|
| committer | Grigori Goronzy <greg@kinoho.net> | 2014-01-24 16:38:11 -0800 |
| commit | 1f57d903bb63389f5ce279957fd8992a981aaafe (patch) | |
| tree | 4fecef6cd413752af9c93e14ad7fb77e98c71458 | |
| parent | 97f74166cfc6e2884c405846b030215331c37a75 (diff) | |
| parent | 1d78d898ae1edde3adccd409fc276174de59f101 (diff) | |
| download | libass-1f57d903bb63389f5ce279957fd8992a981aaafe.tar.bz2 libass-1f57d903bb63389f5ce279957fd8992a981aaafe.tar.xz | |
Merge pull request #28 from astiob/compat
Fix \k starting time and incorrectly skipped fonts
| -rw-r--r-- | libass/ass_fontconfig.c | 2 | ||||
| -rw-r--r-- | libass/ass_parse.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libass/ass_fontconfig.c b/libass/ass_fontconfig.c index b8ad9ec..dcb0bcf 100644 --- a/libass/ass_fontconfig.c +++ b/libass/ass_fontconfig.c @@ -188,7 +188,7 @@ static char *select_font(ASS_Library *library, FCInstance *priv, */ FcPatternDel(pat, "lang"); - fsorted = FcFontSort(priv->config, pat, FcTrue, NULL, &result); + fsorted = FcFontSort(priv->config, pat, FcFalse, NULL, &result); ffullname = match_fullname(library, priv, family, bold, italic); if (!fsorted || !ffullname) goto error; diff --git a/libass/ass_parse.c b/libass/ass_parse.c index c74f3b3..c3292c9 100644 --- a/libass/ass_parse.c +++ b/libass/ass_parse.c @@ -966,7 +966,7 @@ void process_karaoke_effects(ASS_Renderer *render_priv) dt = (tm_current - tm_start); if ((s1->effect_type == EF_KARAOKE) || (s1->effect_type == EF_KARAOKE_KO)) { - if (dt > 0) + if (dt >= 0) x = x_end + 1; else x = x_start; |