summaryrefslogtreecommitdiffstats
path: root/libmenu
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 /libmenu
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 'libmenu')
-rw-r--r--libmenu/vf_menu.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libmenu/vf_menu.c b/libmenu/vf_menu.c
index a49040611e..0363f4d95d 100644
--- a/libmenu/vf_menu.c
+++ b/libmenu/vf_menu.c
@@ -11,6 +11,7 @@
#include <malloc.h>
#endif
+#include "mplayer.h"
#include "mp_msg.h"
#include "libmpcodecs/img_format.h"
@@ -267,7 +268,7 @@ static int config(struct vf_instance_s* vf, int width, int height, int d_width,
// here is the right place to get screen dimensions
if (force_load_font) {
force_load_font = 0;
- load_font_ft(width,height);
+ load_font_ft(width,height,&vo_font,font_name);
}
#endif
if(outfmt == IMGFMT_MPEGPES)