diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-29 14:59:23 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-29 14:59:23 +0000 |
| commit | c8b0ddfe4e1570b83b815a3c9befced24e4d2875 (patch) | |
| tree | d0e864e177b24d068bea47f15a911d16a252ddc3 /libvo/sub.c | |
| parent | 7e26b6cc29c1f050f55152f0759cd2db276d107e (diff) | |
| download | mpv-c8b0ddfe4e1570b83b815a3c9befced24e4d2875.tar.bz2 mpv-c8b0ddfe4e1570b83b815a3c9befced24e4d2875.tar.xz | |
these patches let ,,oldstyle'' and freetype subtitle renderers live
together happily. if an oldstyle subtitle (font.desc) is found, it will
be used. otherwise mplayer will choose subfont.ttf, if freetype was
detected during ./configure.
(also you can use -font /path/to/font.desc and -font /path/to/foobar.ttf too)
patch-set by Wojtek Kaniewski <wojtekka@bydg.pdi.net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8636 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/sub.c')
| -rw-r--r-- | libvo/sub.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libvo/sub.c b/libvo/sub.c index fe9385ba93..6bfb0d7d5c 100644 --- a/libvo/sub.c +++ b/libvo/sub.c @@ -526,9 +526,9 @@ int vo_update_osd(int dxs,int dys){ #ifdef HAVE_FREETYPE // here is the right place to get screen dimensions - if (force_load_font) { + if (!vo_font && force_load_font) { force_load_font = 0; - load_font(dxs, dys); + load_font_ft(dxs, dys); } #endif |