summaryrefslogtreecommitdiffstats
path: root/libass
diff options
context:
space:
mode:
authoreugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-02-20 16:37:18 +0000
committereugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-02-20 16:37:18 +0000
commit796df567248b81b8d879aba01f6c1112a2b4c839 (patch)
treedaab9163c3fa9d7e0440bf9944cab4fb6edc821d /libass
parentc8497d41771c92c4765873791d8b44a828c0bb12 (diff)
downloadmpv-796df567248b81b8d879aba01f6c1112a2b4c839.tar.bz2
mpv-796df567248b81b8d879aba01f6c1112a2b4c839.tar.xz
\fn without an argument resets font family to the value from style.
Fixes bugzilla #762. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22287 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libass')
-rw-r--r--libass/ass_render.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/libass/ass_render.c b/libass/ass_render.c
index d179a8a0bc..ae1045efcc 100644
--- a/libass/ass_render.c
+++ b/libass/ass_render.c
@@ -791,9 +791,12 @@ static char* parse_tag(char* p, double pwr) {
char* start = p;
char* family;
skip_all('\\');
- family = malloc(p - start + 1);
- strncpy(family, start, p - start);
- family[p - start] = '\0';
+ if (p > start) {
+ family = malloc(p - start + 1);
+ strncpy(family, start, p - start);
+ family[p - start] = '\0';
+ } else
+ family = strdup(render_context.style->FontName);
if (render_context.family)
free(render_context.family);
render_context.family = family;