# HG changeset patch
# User arpi
# Date 1047862106 0
# Node ID a9273ae50f59d9e8dab4739490a6e91517338457
# Parent  4847392922bedbce332816123a200849697aa9ce
what's the opposite of backport? :)
some changes ported from 0_90

diff -r 4847392922be -r a9273ae50f59 Gui/cfg.c
--- a/Gui/cfg.c	Sun Mar 16 22:59:16 2003 +0000
+++ b/Gui/cfg.c	Mon Mar 17 00:48:26 2003 +0000
@@ -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 
diff -r 4847392922be -r a9273ae50f59 Gui/mplayer/gtk/about.c
--- a/Gui/mplayer/gtk/about.c	Sun Mar 16 22:59:16 2003 +0000
+++ b/Gui/mplayer/gtk/about.c	Mon Mar 17 00:48:26 2003 +0000
@@ -85,7 +85,7 @@
 	"     * Gabor Lenart (LGB)\n" 
 	"     * Felix Buenemann (Atmos)\n" 
 	"     * Alban Bedel (Albeu)\n" 
-	"     * pl\n" 
+	"     * Pierre Lombard (pl)\n" 
 	"     * Michael Niedermayer\n" 
 	"\n" 
 	MSGTR_ABOUT_AdditionalCoders 
@@ -111,7 +111,7 @@
 	"     * Kamil Toman\n"
 	"     * Ivan Kalvatchev\n"
 	"     * Sven Goethel\n" 
-	"     * joy_ping\n"
+	"     * Joy Winter\n"
 	"     * Eric Anholt\n"
 	"     * Jiri Svoboda\n"
 	"     * Oliver Schoenbrunner\n" 
@@ -141,14 +141,37 @@
 	"     * Joey Parrish\n"
 	"     * Dominik Mierzejewski\n" 
 	"     * Florian Schneider\n" 
+	"     * Sidik Isani\n"
+	"     * Fredrik Noring\n"
+	"     * Kees Cook\n"
+	"     * Hampa Hug\n"
+	"     * Uwe Reder\n"
+	"     * Andriy N. Gritsenko\n"
+	"     * Juergen Hammelmann\n"
+	"     * Martin Gansser\n"
+	"     * Matteo Giani\n"
+	"     * Rudolf Marek\n"
+	"     * Tilman Sauerbeck\n"
+	"     * Mark Zealey\n"
+	"     * Gregory Kovriga\n"
+	"     * Remi Guyomarch\n"
+	"     * Salvatore Falco\n"
+	"     * Ville Syrjala\n"
+	"     * Bjorn Sandell\n"
+	"     * Per Wigren\n"
+	"     * Nicolas Le Gaillart\n"
+	"     * Lu Ran\n"
+	"     * Andras Mohari\n"
+	"     * Denes Balatoni\n"
+	"     * Oskar Liljeblad\n"
+	"     * Bernd Ernesti\n"
 	"\n"
 	MSGTR_ABOUT_MainTesters 
 	"\n" 
 	"     * Tibor Balazs (Tibcu)\n" 
 	"     * Peter Sasi (SaPe)\n"
-	"     * Christoph H. Lampert\n"
-	"     * Attila Kinali\n" 
-	"     * Dirk Vornheder\n" 
+	"     * Christoph H. Lampert (Gruel)\n"
+	"     * Attila Kinali (KotH)\n" 
 	"     * Bohdan Horst (Nexus)\n" 
 	"\n",-1 );