Mercurial > mplayer.hg

diff sub/sub.c @ 36729:19e0fc815a0e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compilation without freetype. subtitle_font_encoding is now also used when freetype is disabled.
author reimar
date Wed, 12 Feb 2014 19:16:31 +0000
parents 317eee237d0f
children
line wrap: on
line diff
--- a/sub/sub.c	Sun Feb 09 22:19:09 2014 +0000
+++ b/sub/sub.c	Wed Feb 12 19:16:31 2014 +0000
@@ -84,6 +84,7 @@
 //static int vo_font_loaded=-1;
 font_desc_t* vo_font=NULL;
 font_desc_t* sub_font=NULL;
+char *subtitle_font_encoding = NULL;
 
 unsigned char* vo_osd_text=NULL;
 void* vo_osd_teletext_page=NULL;