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
This commit is contained in:
zuxy 2007-07-11 10:01:54 +00:00
parent e37bbce66c
commit 99cc5ec179
1 changed files with 8 additions and 2 deletions

View File

@ -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