Mercurial > mplayer.hg

comparison libmenu/vf_menu.c @ 23338:2a66d95355f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add new -subfont option, that allows having a different font for OSD (controls and menu) and subtitles
author ben
date Sun, 20 May 2007 16:10:45 +0000
parents 83366c8e1928
children b344b6520518
comparison
equal deleted inserted replaced
23337:10a7279b8e56 23338:2a66d95355f0
9 9
10 #ifdef HAVE_MALLOC_H 10 #ifdef HAVE_MALLOC_H
11 #include <malloc.h> 11 #include <malloc.h>
12 #endif 12 #endif
13 13
14 #include "mplayer.h"
14 #include "mp_msg.h" 15 #include "mp_msg.h"
15 16
16 #include "libmpcodecs/img_format.h" 17 #include "libmpcodecs/img_format.h"
17 #include "libmpcodecs/mp_image.h" 18 #include "libmpcodecs/mp_image.h"
18 #include "libmpcodecs/vf.h" 19 #include "libmpcodecs/vf.h"
265 unsigned int flags, unsigned int outfmt) { 266 unsigned int flags, unsigned int outfmt) {
266 #ifdef HAVE_FREETYPE 267 #ifdef HAVE_FREETYPE
267 // here is the right place to get screen dimensions 268 // here is the right place to get screen dimensions
268 if (force_load_font) { 269 if (force_load_font) {
269 force_load_font = 0; 270 force_load_font = 0;
270 load_font_ft(width,height); 271 load_font_ft(width,height,&vo_font,font_name);
271 } 272 }
272 #endif 273 #endif
273 if(outfmt == IMGFMT_MPEGPES) 274 if(outfmt == IMGFMT_MPEGPES)
274 vf->priv->passthrough = 1; 275 vf->priv->passthrough = 1;
275 return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); 276 return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);