summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-05-20 16:10:45 +0000
committerben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-05-20 16:10:45 +0000
commit194fc1b15b8c5dfb3b7a5a78e0f83ed9c0e21f3b (patch)
tree41f7242c3a4d81ed3fe2d9c7df157bff44dd9a57 /mplayer.c
parentb0615f0024c7a7f073e85d7e8b992bd78ee88515 (diff)
downloadmpv-194fc1b15b8c5dfb3b7a5a78e0f83ed9c0e21f3b.tar.bz2
mpv-194fc1b15b8c5dfb3b7a5a78e0f83ed9c0e21f3b.tar.xz
add new -subfont option, that allows having a different font for OSD (controls and menu) and subtitles
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23356 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/mplayer.c b/mplayer.c
index cfc22415e5..df7dd17d10 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -322,6 +322,7 @@ extern int vo_flags;
// sub:
char *font_name=NULL;
+char *sub_font_name=NULL;
#ifdef HAVE_FONTCONFIG
extern int font_fontconfig;
#endif
@@ -2533,6 +2534,10 @@ if(!codecs_file || !parse_codec_cfg(codecs_file)){
if(!vo_font)
vo_font=read_font_desc(MPLAYER_DATADIR "/font/font.desc",font_factor,verbose>1);
}
+ if (sub_font_name)
+ sub_font = read_font_desc(sub_font_name, font_factor, verbose>1);
+ else
+ sub_font = vo_font;
#endif
#ifdef HAVE_FONTCONFIG
}