Mercurial > mplayer.hg

comparison 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
comparison
equal deleted inserted replaced
36728:56cfc2c9cbad 36729:19e0fc815a0e
82 char * sub_osd_names_short[] ={ "", "|>", "||", "[]", "<<" , ">>", "", "", "", "", "", "", "" }; 82 char * sub_osd_names_short[] ={ "", "|>", "||", "[]", "<<" , ">>", "", "", "", "", "", "", "" };
83 83
84 //static int vo_font_loaded=-1; 84 //static int vo_font_loaded=-1;
85 font_desc_t* vo_font=NULL; 85 font_desc_t* vo_font=NULL;
86 font_desc_t* sub_font=NULL; 86 font_desc_t* sub_font=NULL;
87 char *subtitle_font_encoding = NULL;
87 88
88 unsigned char* vo_osd_text=NULL; 89 unsigned char* vo_osd_text=NULL;
89 void* vo_osd_teletext_page=NULL; 90 void* vo_osd_teletext_page=NULL;
90 int vo_osd_teletext_half = 0; 91 int vo_osd_teletext_half = 0;
91 int vo_osd_teletext_mode=0; 92 int vo_osd_teletext_mode=0;