[Mplayer-cvslog] CVS: main/Gui cfg.c,1.35,1.36

[Arpi of Ize]

Update of /cvsroot/mplayer/main/Gui
In directory mail:/var/tmp.root/cvs-serv19333

Modified Files:
	cfg.c 
Log Message:
what's the opposite of backport? :)
some changes ported from 0_90


Index: cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/cfg.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- cfg.c	1 Feb 2003 16:41:39 -0000	1.35
+++ cfg.c	17 Mar 2003 00:48:07 -0000	1.36
@@ -117,7 +117,9 @@
  { "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