diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-03-17 00:48:26 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-03-17 00:48:26 +0000 |
| commit | 561ab920c04aa9c4c846d88891e28275b119bbbe (patch) | |
| tree | fcd0027556b3d81d3353047485db16559ed7d4bc /Gui/cfg.c | |
| parent | 4753a8565e72b606f9721412458e4709a9a04fa8 (diff) | |
| download | mpv-561ab920c04aa9c4c846d88891e28275b119bbbe.tar.bz2 mpv-561ab920c04aa9c4c846d88891e28275b119bbbe.tar.xz | |
what's the opposite of backport? :)
some changes ported from 0_90
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9613 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/cfg.c')
| -rw-r--r-- | Gui/cfg.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -117,7 +117,9 @@ static config_t gui_opts[] = { "sub_unicode",&sub_unicode,CONF_TYPE_FLAG,0,0,1,NULL }, { "sub_pos",&sub_pos,CONF_TYPE_INT,CONF_RANGE,0,200,NULL }, { "sub_overlap",&suboverlap_enabled,CONF_TYPE_FLAG,0,0,0,NULL }, +#ifdef USE_ICONV { "sub_cp",&sub_cp,CONF_TYPE_STRING,0,0,0,NULL }, +#endif { "font_factor",&font_factor,CONF_TYPE_FLOAT,CONF_RANGE,0.0,10.0,NULL }, { "font_name",&font_name,CONF_TYPE_STRING,0,0,0,NULL }, #ifdef HAVE_FREETYPE |