diff options
| author | zuxy <zuxy@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-07-11 10:01:54 +0000 |
|---|---|---|
| committer | zuxy <zuxy@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-07-11 10:01:54 +0000 |
| commit | 99cc5ec179083590fc7c8d91380f617ab5a4e21e (patch) | |
| tree | ef29cca73e62b066ac76626eaa4879aab61e8347 /libvo | |
| parent | e37bbce66cb1582b937aaf3884b8504311f7f5df (diff) | |
| download | mpv-99cc5ec179083590fc7c8d91380f617ab5a4e21e.tar.bz2 mpv-99cc5ec179083590fc7c8d91380f617ab5a4e21e.tar.xz | |
Use -font for subtitles when -subfont is not given, patch by kiriuja
<mplayer-patches AT en-directo DOT net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23762 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/sub.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libvo/sub.c b/libvo/sub.c index 6f1b97696b..77e3400d78 100644 --- a/libvo/sub.c +++ b/libvo/sub.c @@ -835,7 +835,10 @@ int vo_update_osd(int dxs,int dys){ if (force_load_font) { force_load_font = 0; load_font_ft(dxs, dys, &vo_font, font_name); - load_font_ft(dxs, dys, &sub_font, sub_font_name); + if (sub_font_name) + load_font_ft(dxs, dys, &sub_font, sub_font_name); + else + sub_font = vo_font; prev_dxs = dxs; prev_dys = dys; defer_counter = 0; @@ -843,7 +846,10 @@ int vo_update_osd(int dxs,int dys){ if (!vo_font) load_font_ft(dxs, dys, &vo_font, font_name); if (!sub_font) - load_font_ft(dxs, dys, &sub_font, sub_font_name); + if (sub_font_name) + load_font_ft(dxs, dys, &sub_font, sub_font_name); + else + sub_font = vo_font; } #endif |