From 561ab920c04aa9c4c846d88891e28275b119bbbe Mon Sep 17 00:00:00 2001
From: arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 17 Mar 2003 00:48:26 +0000
Subject: 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
---
 Gui/cfg.c               |  2 ++
 Gui/mplayer/gtk/about.c | 33 ++++++++++++++++++++++++++++-----
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/Gui/cfg.c b/Gui/cfg.c
index 0944495d4e..c32f058cf3 100644
--- a/Gui/cfg.c
+++ b/Gui/cfg.c
@@ -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 
diff --git a/Gui/mplayer/gtk/about.c b/Gui/mplayer/gtk/about.c
index 5e7e37a3ae..e914b5c29d 100644
--- a/Gui/mplayer/gtk/about.c
+++ b/Gui/mplayer/gtk/about.c
@@ -85,7 +85,7 @@ GtkWidget * create_About( void )
 	"     * 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 @@ GtkWidget * create_About( void )
 	"     * 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 @@ GtkWidget * create_About( void )
 	"     * 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 );
 
-- 
cgit v1.2.3