From 99cc5ec179083590fc7c8d91380f617ab5a4e21e Mon Sep 17 00:00:00 2001 From: zuxy Date: Wed, 11 Jul 2007 10:01:54 +0000 Subject: [PATCH] Use -font for subtitles when -subfont is not given, patch by kiriuja git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23762 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/sub.c | 10 ++++++++-- 1 file 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 -- 2.11.4.GIT