diff options
| author | wm4 <wm4@nowhere> | 2013-04-30 00:52:32 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-04-30 00:52:32 +0200 |
| commit | ea7b920184a865a3343001318fc4a32dcfc7b4f5 (patch) | |
| tree | fbefd8539b77ee7473ad73740cc8ffa97bc4ffbe /sub/ass_mp.c | |
| parent | 3dcc83a70609d392c8ecd917dd5c16995424e9c4 (diff) | |
| parent | d98e61ea438db66323734ad1b6bea66411a3c97b (diff) | |
| download | mpv-ea7b920184a865a3343001318fc4a32dcfc7b4f5.tar.bz2 mpv-ea7b920184a865a3343001318fc4a32dcfc7b4f5.tar.xz | |
Merge branch 'master' into low_quality_intel_crap
Conflicts:
video/out/gl_video_shaders.glsl
video/out/vo_opengl.c
Diffstat (limited to 'sub/ass_mp.c')
| -rw-r--r-- | sub/ass_mp.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sub/ass_mp.c b/sub/ass_mp.c index 2312eaeff5..497e307953 100644 --- a/sub/ass_mp.c +++ b/sub/ass_mp.c @@ -69,6 +69,9 @@ void mp_ass_set_style(ASS_Style *style, struct osd_style_opts *opts) style->MarginV = opts->margin_y * scale; style->ScaleX = 1.; style->ScaleY = 1.; +#if LIBASS_VERSION >= 0x01020000 + style->Blur = opts->blur; +#endif } ASS_Track *mp_ass_default_track(ASS_Library *library, struct MPOpts *opts) @@ -267,7 +270,9 @@ void mp_ass_configure_fonts(ASS_Renderer *priv, struct osd_style_opts *opts) default_font = NULL; } + mp_msg(MSGT_ASS, MSGL_V, "[ass] Setting up fonts...\n"); ass_set_fonts(priv, default_font, opts->font, 1, config, 1); + mp_msg(MSGT_ASS, MSGL_V, "[ass] Done.\n"); talloc_free(default_font); talloc_free(config); |