diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-01-27 15:14:02 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-01-27 15:14:02 +0000 |
commit | fbae3928cddfcb459445f105daac12b42f2991ba (patch) | |
tree | 2dfd8834e7f3e93478b3fa655fe28f6b7548b3c7 /libvo/sub.c | |
parent | 131683f8f35aed3145af816e8ea3dea3c6f4bd31 (diff) | |
download | mpv-fbae3928cddfcb459445f105daac12b42f2991ba.tar.bz2 mpv-fbae3928cddfcb459445f105daac12b42f2991ba.tar.xz |
Allow independent scaling of vo_font and sub_font.
Patch by Guillaume LECERF (foxcore gmail com).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25879 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/sub.c')
-rw-r--r-- | libvo/sub.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libvo/sub.c b/libvo/sub.c index 2a7d4a4a96..aeb68d216b 100644 --- a/libvo/sub.c +++ b/libvo/sub.c @@ -1090,22 +1090,22 @@ 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, &vo_font, font_name, osd_font_scale_factor); if (sub_font_name) - load_font_ft(dxs, dys, &sub_font, sub_font_name); + load_font_ft(dxs, dys, &sub_font, sub_font_name, text_font_scale_factor); else - sub_font = vo_font; + load_font_ft(dxs, dys, &sub_font, font_name, text_font_scale_factor); prev_dxs = dxs; prev_dys = dys; defer_counter = 0; } else { if (!vo_font) - load_font_ft(dxs, dys, &vo_font, font_name); + load_font_ft(dxs, dys, &vo_font, font_name, osd_font_scale_factor); if (!sub_font) { if (sub_font_name) - load_font_ft(dxs, dys, &sub_font, sub_font_name); + load_font_ft(dxs, dys, &sub_font, sub_font_name, text_font_scale_factor); else - sub_font = vo_font; + load_font_ft(dxs, dys, &sub_font, font_name, text_font_scale_factor); } } #endif |