make all the plugin init functions static

(geez this was a job)

CVS patchset: 2616
CVS date: 2002/09/05 20:44:38

75 files changed, 168 insertions, 177 deletions

diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c
index 5db74b169..49d33d74d 100644
--- a/src/audio_out/audio_alsa_out.c
+++ b/src/audio_out/audio_alsa_out.c
@@ -26,7 +26,7 @@
  * (c) 2001 James Courtier-Dutton <James@superbug.demon.co.uk>
  *
  * 
- * $Id: audio_alsa_out.c,v 1.76 2002/09/04 23:31:07 guenter Exp $
+ * $Id: audio_alsa_out.c,v 1.77 2002/09/05 20:44:38 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -426,6 +426,7 @@ static int ao_alsa_delay (xine_ao_driver_t *this_gen)
   /* snd_pcm_status_dump(pcm_stat, jcd_out);  */
   delay=snd_pcm_status_get_delay( pcm_stat );
   /* printf("audio_alsa_out:delay:delay=%ld\n",delay); */
+  if (delay < 0) delay = 0;
   return delay;
 }
 
@@ -901,7 +902,7 @@ static void ao_alsa_mixer_init(xine_ao_driver_t *this_gen) {
 /*
  * Initialize plugin
  */
-void *init_audio_out_plugin (xine_t *xine, void *data) {
+static void *init_audio_out_plugin (xine_t *xine, void *data) {
 
   config_values_t     *config = xine->config;
   alsa_driver_t       *this;
diff --git a/src/audio_out/audio_arts_out.c b/src/audio_out/audio_arts_out.c
index f90d01bd5..a808ac1ce 100644
--- a/src/audio_out/audio_arts_out.c
+++ b/src/audio_out/audio_arts_out.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: audio_arts_out.c,v 1.14 2002/09/04 23:31:07 guenter Exp $
+ * $Id: audio_arts_out.c,v 1.15 2002/09/05 20:44:38 mroi Exp $
  */
 
 /* required for swab() */
@@ -298,7 +298,7 @@ static int ao_arts_ctrl(xine_ao_driver_t *this_gen, int cmd, ...) {
 }
 
 
-void *init_audio_out_plugin (xine_t *xine, void *data) {
+static void *init_audio_out_plugin (xine_t *xine, void *data) {
 
   /* config_values_t *config = xine->config; */
   arts_driver_t   *this;
diff --git a/src/audio_out/audio_esd_out.c b/src/audio_out/audio_esd_out.c
index ab489f471..5d7e32194 100644
--- a/src/audio_out/audio_esd_out.c
+++ b/src/audio_out/audio_esd_out.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: audio_esd_out.c,v 1.20 2002/09/04 23:31:07 guenter Exp $
+ * $Id: audio_esd_out.c,v 1.21 2002/09/05 20:44:38 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -362,7 +362,7 @@ static int ao_esd_ctrl(xine_ao_driver_t *this_gen, int cmd, ...) {
   return 0;
 }
 
-void *init_audio_out_plugin (xine_t *xine, void *data) {
+static void *init_audio_out_plugin (xine_t *xine, void *data) {
 
   config_values_t *config = xine->config;
   esd_driver_t    *this;
diff --git a/src/audio_out/audio_irixal_out.c b/src/audio_out/audio_irixal_out.c
index 5b8191c16..f0ad61f17 100644
--- a/src/audio_out/audio_irixal_out.c
+++ b/src/audio_out/audio_irixal_out.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: audio_irixal_out.c,v 1.8 2002/09/04 23:31:07 guenter Exp $
+ * $Id: audio_irixal_out.c,v 1.9 2002/09/05 20:44:38 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -310,7 +310,7 @@ static int ao_irixal_ctrl(ao_driver_t *this_gen, int cmd, ...) {
   return 0;
 }
 
-ao_driver_t *init_audio_out_plugin (config_values_t *config)
+static void *init_audio_out_plugin (config_values_t *config)
 {
   irixal_driver_t *this;
   ALvalue values [32];
diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c
index d03ce62ad..53b0155c4 100644
--- a/src/audio_out/audio_oss_out.c
+++ b/src/audio_out/audio_oss_out.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: audio_oss_out.c,v 1.72 2002/09/04 23:31:07 guenter Exp $
+ * $Id: audio_oss_out.c,v 1.73 2002/09/05 20:44:38 mroi Exp $
  *
  * 20-8-2001 First implementation of Audio sync and Audio driver separation.
  * Copyright (C) 2001 James Courtier-Dutton James@superbug.demon.co.uk
@@ -611,7 +611,7 @@ static int ao_oss_ctrl(xine_ao_driver_t *this_gen, int cmd, ...) {
   return 0;
 }
 
-void *init_audio_out_plugin (xine_t *xine, void *data) {
+static void *init_audio_out_plugin (xine_t *xine, void *data) {
 
   config_values_t *config = xine->config;
   oss_driver_t    *this;
diff --git a/src/audio_out/audio_sun_out.c b/src/audio_out/audio_sun_out.c
index b5af274c8..78a5ef391 100644
--- a/src/audio_out/audio_sun_out.c
+++ b/src/audio_out/audio_sun_out.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: audio_sun_out.c,v 1.21 2002/09/04 23:31:07 guenter Exp $
+ * $Id: audio_sun_out.c,v 1.22 2002/09/05 20:44:38 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -650,7 +650,7 @@ static int ao_sun_ctrl(ao_driver_t *this_gen, int cmd, ...) {
   return 0;
 }
 
-ao_driver_t *init_audio_out_plugin (config_values_t *config) {
+static void *init_audio_out_plugin (config_values_t *config) {
 
   sun_driver_t	  *this;
   char            *devname;
diff --git a/src/demuxers/demux_aiff.c b/src/demuxers/demux_aiff.c
index ed656c67d..36be57f73 100644
--- a/src/demuxers/demux_aiff.c
+++ b/src/demuxers/demux_aiff.c
@@ -19,7 +19,7 @@
  *
  * AIFF File Demuxer by Mike Melanson (melanson@pcisys.net)
  *
- * $Id: demux_aiff.c,v 1.2 2002/09/04 23:31:07 guenter Exp $
+ * $Id: demux_aiff.c,v 1.3 2002/09/05 20:44:39 mroi Exp $
  *
  */
 
@@ -475,7 +475,7 @@ static int demux_aiff_get_stream_length (demux_plugin_t *this_gen) {
   return this->running_time;
 }
 
-demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
+static void *init_demuxer_plugin(int iface, xine_t *xine) {
 
   demux_aiff_t *this;
 
diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c
index e849ef8a7..97724b9b9 100644
--- a/src/demuxers/demux_asf.c
+++ b/src/demuxers/demux_asf.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_asf.c,v 1.54 2002/09/04 23:31:07 guenter Exp $
+ * $Id: demux_asf.c,v 1.55 2002/09/05 20:44:39 mroi Exp $
  *
  * demultiplexer for asf streams
  *
@@ -1439,7 +1439,7 @@ static int demux_asf_get_stream_length (demux_plugin_t *this_gen) {
   return this->length;
 }
 
-void *init_demuxer_plugin (xine_t *xine, void *data) {
+static void *init_demuxer_plugin (xine_t *xine, void *data) {
 
   demux_asf_t     *this;
 
diff --git a/src/demuxers/demux_cda.c b/src/demuxers/demux_cda.c
index a412e0dbd..2afd05895 100644
--- a/src/demuxers/demux_cda.c
+++ b/src/demuxers/demux_cda.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_cda.c,v 1.21 2002/07/05 17:31:59 mroi Exp $
+ * $Id: demux_cda.c,v 1.22 2002/09/05 20:44:39 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -290,7 +290,7 @@ static int demux_cda_get_stream_length (demux_plugin_t *this_gen) {
 /*
  *
  */
-demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
+static void *init_demuxer_plugin(int iface, xine_t *xine) {
   demux_cda_t *this;
   
   if (iface != 10) {
diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c
index 412d89614..73967a5f1 100644
--- a/src/demuxers/demux_film.c
+++ b/src/demuxers/demux_film.c
@@ -21,7 +21,7 @@
  * For more information on the FILM file format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: demux_film.c,v 1.22 2002/09/04 23:31:07 guenter Exp $
+ * $Id: demux_film.c,v 1.23 2002/09/05 20:44:39 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -784,7 +784,7 @@ static char *demux_film_get_mimetypes(void) {
 }
 
 
-demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
+static void *init_demuxer_plugin(int iface, xine_t *xine) {
   demux_film_t *this;
 
   if (iface != 10) {
diff --git a/src/demuxers/demux_fli.c b/src/demuxers/demux_fli.c
index fab3a1593..11d8460f2 100644
--- a/src/demuxers/demux_fli.c
+++ b/src/demuxers/demux_fli.c
@@ -22,7 +22,7 @@
  * avoid while programming a FLI decoder, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: demux_fli.c,v 1.7 2002/09/04 23:31:07 guenter Exp $
+ * $Id: demux_fli.c,v 1.8 2002/09/05 20:44:39 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -401,7 +401,7 @@ static char *demux_fli_get_mimetypes(void) {
   return NULL;
 }
 
-demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
+static void *init_demuxer_plugin(int iface, xine_t *xine) {
   demux_fli_t *this;
 
   if (iface != 10) {
diff --git a/src/demuxers/demux_idcin.c b/src/demuxers/demux_idcin.c
index 2c42b1895..79ef976b7 100644
--- a/src/demuxers/demux_idcin.c
+++ b/src/demuxers/demux_idcin.c
@@ -63,7 +63,7 @@
  *     - if any bytes exceed 63, do not shift the bytes at all before
  *       transmitting them to the video decoder
  *
- * $Id: demux_idcin.c,v 1.7 2002/09/04 23:31:07 guenter Exp $
+ * $Id: demux_idcin.c,v 1.8 2002/09/05 20:44:39 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -587,7 +587,7 @@ static char *demux_idcin_get_mimetypes(void) {
   return NULL;
 }
 
-demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
+static void *init_demuxer_plugin(int iface, xine_t *xine) {
   demux_idcin_t *this;
 
   if (iface != 10) {
diff --git a/src/demuxers/demux_pes.c b/src/demuxers/demux_pes.c
index 931f3bad4..ab492fce8 100644
--- a/src/demuxers/demux_pes.c
+++ b/src/demuxers/demux_pes.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_pes.c,v 1.35 2002/09/04 23:31:08 guenter Exp $
+ * $Id: demux_pes.c,v 1.36 2002/09/05 20:44:39 mroi Exp $
  *
  * demultiplexer for mpeg 2 PES (Packetized Elementary Streams)
  * reads streams of variable blocksizes
@@ -594,7 +594,7 @@ static int demux_pes_get_stream_length (demux_plugin_t *this_gen) {
   return 0; /* FIXME: implement */
 }
 
-demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
+static void *init_demuxer_plugin(int iface, xine_t *xine) {
 
   demux_pes_t     *this;
 
diff --git a/src/demuxers/demux_roq.c b/src/demuxers/demux_roq.c
index 35188d113..b9f4cea10 100644
--- a/src/demuxers/demux_roq.c
+++ b/src/demuxers/demux_roq.c
@@ -21,7 +21,7 @@
  * For more information regarding the RoQ file format, visit:
  *   http://www.csse.monash.edu.au/~timf/
  *
- * $Id: demux_roq.c,v 1.11 2002/09/04 23:31:08 guenter Exp $
+ * $Id: demux_roq.c,v 1.12 2002/09/05 20:44:39 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -524,7 +524,7 @@ static char *demux_roq_get_mimetypes(void) {
 }
 
 
-demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
+static void *init_demuxer_plugin(int iface, xine_t *xine) {
   demux_roq_t *this;
 
   if (iface != 10) {
diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c
index 80566a6c4..a0aef33f0 100644
--- a/src/demuxers/demux_smjpeg.c
+++ b/src/demuxers/demux_smjpeg.c
@@ -21,7 +21,7 @@
  * For more information on the SMJPEG file format, visit:
  *   http://www.lokigames.com/development/smjpeg.php3
  *
- * $Id: demux_smjpeg.c,v 1.11 2002/09/04 23:31:08 guenter Exp $
+ * $Id: demux_smjpeg.c,v 1.12 2002/09/05 20:44:39 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -553,7 +553,7 @@ static char *demux_smjpeg_get_mimetypes(void) {
   return NULL;
 }
 
-demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
+static void *init_demuxer_plugin(int iface, xine_t *xine) {
   demux_smjpeg_t *this;
 
   if (iface != 10) {
diff --git a/src/demuxers/demux_snd.c b/src/demuxers/demux_snd.c
index 9fce979f0..02139bcdc 100644
--- a/src/demuxers/demux_snd.c
+++ b/src/demuxers/demux_snd.c
@@ -19,7 +19,7 @@
  *
  * SND/AU File Demuxer by Mike Melanson (melanson@pcisys.net)
  *
- * $Id: demux_snd.c,v 1.3 2002/09/04 23:31:08 guenter Exp $
+ * $Id: demux_snd.c,v 1.4 2002/09/05 20:44:39 mroi Exp $
  *
  */
 
@@ -460,7 +460,7 @@ static int demux_snd_get_stream_length (demux_plugin_t *this_gen) {
   return this->running_time;
 }
 
-demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
+static void *init_demuxer_plugin(int iface, xine_t *xine) {
 
   demux_snd_t *this;
 
diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c
index c8b020999..1293f36d1 100644
--- a/src/demuxers/demux_ts.c
+++ b/src/demuxers/demux_ts.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_ts.c,v 1.53 2002/09/04 23:31:08 guenter Exp $
+ * $Id: demux_ts.c,v 1.54 2002/09/05 20:44:39 mroi Exp $
  *
  * Demultiplexer for MPEG2 Transport Streams.
  *
@@ -1652,7 +1652,7 @@ static int demux_ts_get_stream_length (demux_plugin_t *this_gen) {
 }
 
 
-demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
+static void *init_demuxer_plugin(int iface, xine_t *xine) {
 
   demux_ts        *this;
   int              i;
diff --git a/src/demuxers/demux_voc.c b/src/demuxers/demux_voc.c
index 6c9c74ac7..67071ed32 100644
--- a/src/demuxers/demux_voc.c
+++ b/src/demuxers/demux_voc.c
@@ -23,7 +23,7 @@
  * It will only play that block if it is PCM data. More variations will be
  * supported as they are encountered.
  *
- * $Id: demux_voc.c,v 1.3 2002/09/04 23:31:08 guenter Exp $
+ * $Id: demux_voc.c,v 1.4 2002/09/05 20:44:39 mroi Exp $
  *
  */
 
@@ -452,7 +452,7 @@ static int demux_voc_get_stream_length (demux_plugin_t *this_gen) {
   return this->running_time;
 }
 
-demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
+static void *init_demuxer_plugin(int iface, xine_t *xine) {
 
   demux_voc_t *this;
 
diff --git a/src/demuxers/demux_vqa.c b/src/demuxers/demux_vqa.c
index 256cf25b1..de693d6fe 100644
--- a/src/demuxers/demux_vqa.c
+++ b/src/demuxers/demux_vqa.c
@@ -21,7 +21,7 @@
  * For more information regarding the VQA file format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: demux_vqa.c,v 1.3 2002/09/04 23:31:08 guenter Exp $
+ * $Id: demux_vqa.c,v 1.4 2002/09/05 20:44:39 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -550,7 +550,7 @@ static char *demux_vqa_get_mimetypes(void) {
 }
 
 
-demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
+static void *init_demuxer_plugin(int iface, xine_t *xine) {
   demux_vqa_t *this;
 
   if (iface != 10) {
diff --git a/src/demuxers/demux_wav.c b/src/demuxers/demux_wav.c
index de4964390..910781153 100644
--- a/src/demuxers/demux_wav.c
+++ b/src/demuxers/demux_wav.c
@@ -20,7 +20,7 @@
  * MS WAV File Demuxer by Mike Melanson (melanson@pcisys.net)
  * based on WAV specs that are available far and wide
  *
- * $Id: demux_wav.c,v 1.9 2002/09/04 23:31:08 guenter Exp $
+ * $Id: demux_wav.c,v 1.10 2002/09/05 20:44:39 mroi Exp $
  *
  */
 
@@ -461,7 +461,7 @@ static int demux_wav_get_stream_length (demux_plugin_t *this_gen) {
   return (int)(this->data_size / this->wave->nAvgBytesPerSec);
 }
 
-demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
+static void *init_demuxer_plugin(int iface, xine_t *xine) {
 
   demux_wav_t *this;
 
diff --git a/src/demuxers/demux_wc3movie.c b/src/demuxers/demux_wc3movie.c
index 0cd3fee35..4dacb26df 100644
--- a/src/demuxers/demux_wc3movie.c
+++ b/src/demuxers/demux_wc3movie.c
@@ -22,7 +22,7 @@
  * For more information on the MVE file format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: demux_wc3movie.c,v 1.4 2002/09/04 23:31:08 guenter Exp $
+ * $Id: demux_wc3movie.c,v 1.5 2002/09/05 20:44:39 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -591,7 +591,7 @@ static char *demux_mve_get_mimetypes(void) {
 }
 
 
-demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
+static void *init_demuxer_plugin(int iface, xine_t *xine) {
   demux_mve_t *this;
 
   if (iface != 10) {
diff --git a/src/dxr3/dxr3.h b/src/dxr3/dxr3.h
index b898f7369..0a2396d8b 100644
--- a/src/dxr3/dxr3.h
+++ b/src/dxr3/dxr3.h
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: dxr3.h,v 1.3 2002/06/12 12:22:34 f1rmb Exp $
+ * $Id: dxr3.h,v 1.4 2002/09/05 20:44:39 mroi Exp $
  */
 
 #ifndef HAVE_DXR3_H
@@ -34,7 +34,7 @@
 #define CONF_HELP _("The device file of the dxr3 mpeg decoder card control device.")
 
 /* image format used by dxr3_decoder to tag undecoded mpeg data */
-#define IMGFMT_MPEG (('G'<<24)|('E'<<16)|('P'<<8)|'M')
+#define XINE_IMGFMT_DXR3 (('3'<<24)|('R'<<16)|('X'<<8)|'D')
 
 #endif
 
diff --git a/src/dxr3/dxr3_decode_video.c b/src/dxr3/dxr3_decode_video.c
index 0ae45e8b1..15bdf1387 100644
--- a/src/dxr3/dxr3_decode_video.c
+++ b/src/dxr3/dxr3_decode_video.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: dxr3_decode_video.c,v 1.13 2002/09/05 12:52:24 mroi Exp $
+ * $Id: dxr3_decode_video.c,v 1.14 2002/09/05 20:44:39 mroi Exp $
  */
  
 /* dxr3 video decoder plugin.
@@ -325,7 +325,7 @@ static void dxr3_decode_data(video_decoder_t *this_gen, buf_element_t *buf)
     /* pretend like we have decoded a frame */
     img = this->video_out->get_frame (this->video_out,
       this->width, this->height, this->aspect,
-      IMGFMT_MPEG, VO_BOTH_FIELDS);
+      XINE_IMGFMT_DXR3, VO_BOTH_FIELDS);
     img->pts       = buf->pts;
     img->bad_frame = 0;
     img->duration  = get_duration(this);
diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c
index d7004d101..0020e4223 100644
--- a/src/dxr3/video_out_dxr3.c
+++ b/src/dxr3/video_out_dxr3.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_dxr3.c,v 1.53 2002/09/05 12:52:24 mroi Exp $
+ * $Id: video_out_dxr3.c,v 1.54 2002/09/05 20:44:39 mroi Exp $
  */
  
 /* mpeg1 encoding video out plugin for the dxr3.  
@@ -63,8 +63,7 @@
 #define LOG_OVR 0
 
 
-/* plugin initialization functions */
-vo_info_t         *get_video_out_plugin_info();
+/* plugin initialization function */
 static void       *dxr3_vo_init_plugin(xine_t *xine, void *visual_gen);
 
 
@@ -377,6 +376,7 @@ static void *dxr3_vo_init_plugin(xine_t *xine, void *visual_gen)
   return &this->vo_driver;
 }
 
+
 static uint32_t dxr3_get_capabilities(xine_vo_driver_t *this_gen)
 {
   return VO_CAP_YV12 | VO_CAP_YUY2 |
@@ -409,7 +409,7 @@ static void dxr3_frame_copy(vo_frame_t *frame_gen, uint8_t **src)
   dxr3_frame_t *frame = (dxr3_frame_t *)frame_gen;
   dxr3_driver_t *this = (dxr3_driver_t *)frame_gen->driver;
   
-  if (frame_gen->format != IMGFMT_MPEG && this->enc && this->enc->on_frame_copy)
+  if (frame_gen->format != XINE_IMGFMT_DXR3 && this->enc && this->enc->on_frame_copy)
     this->enc->on_frame_copy(this, frame, src);
 }
 
@@ -437,7 +437,7 @@ static void dxr3_update_frame_format(xine_vo_driver_t *this_gen, vo_frame_t *fra
   /* update the overlay window co-ords if required */
   dxr3_overlay_update(this);
 
-  if (format == IMGFMT_MPEG) { /* talking to dxr3 decoder */
+  if (format == XINE_IMGFMT_DXR3) { /* talking to dxr3 decoder */
     /* a bit of a hack. we must release the em8300_mv fd for
      * the dxr3 decoder plugin */
     if (this->fd_video >= 0) {
@@ -570,7 +570,7 @@ static void dxr3_update_frame_format(xine_vo_driver_t *this_gen, vo_frame_t *fra
       for (i = 0; i < image_size; i += 2) /* Y */
         *(frame->real_base[0] + i) = 16;
 
-    } else { /* IMGFMT_YV12 */
+    } else { /* XINE_IMGFMT_YV12 */
       int image_size_y, image_size_u, image_size_v;
       
       /* calculate pitches and sizes including black bars */
@@ -620,7 +620,7 @@ static void dxr3_overlay_begin(xine_vo_driver_t *this_gen, vo_frame_t *frame_gen
   dxr3_driver_t *this = (dxr3_driver_t *)this_gen;
   
   /* special treatment is only necessary for mpeg frames */
-  if (frame_gen->format != IMGFMT_MPEG) return;
+  if (frame_gen->format != XINE_IMGFMT_DXR3) return;
   
   if (!this->spu_enc) this->spu_enc = dxr3_spu_encoder_init();
   
@@ -636,7 +636,7 @@ static void dxr3_overlay_begin(xine_vo_driver_t *this_gen, vo_frame_t *frame_gen
 static void dxr3_overlay_blend(xine_vo_driver_t *this_gen, vo_frame_t *frame_gen,
   vo_overlay_t *overlay)
 {
-  if (frame_gen->format != IMGFMT_MPEG) {
+  if (frame_gen->format != XINE_IMGFMT_DXR3) {
     dxr3_frame_t *frame = (dxr3_frame_t *)frame_gen;
     
     if (overlay->rle) {
@@ -645,7 +645,7 @@ static void dxr3_overlay_blend(xine_vo_driver_t *this_gen, vo_frame_t *frame_gen
       else
         blend_yuy2(frame->vo_frame.base[0], overlay, frame->vo_frame.width, frame->vo_frame.height);
     }
-  } else { /* IMGFMT_MPEG */
+  } else { /* XINE_IMGFMT_DXR3 */
     dxr3_driver_t *this = (dxr3_driver_t *)this_gen;
     if (!this->spu_enc->need_reencode) return;
     /* FIXME: we only handle the last overlay because previous ones are simply overwritten */
@@ -660,7 +660,7 @@ static void dxr3_overlay_end(xine_vo_driver_t *this_gen, vo_frame_t *frame_gen)
   char tmpstr[128];
   ssize_t written;
   
-  if (frame_gen->format != IMGFMT_MPEG) return;
+  if (frame_gen->format != XINE_IMGFMT_DXR3) return;
   if (!this->spu_enc->need_reencode) return;
   
   dxr3_spu_encode(this->spu_enc);
@@ -760,7 +760,7 @@ static void dxr3_display_frame(xine_vo_driver_t *this_gen, vo_frame_t *frame_gen
     dxr3_set_property(this_gen, VO_PROP_ZOOM_X, -1);
   }
   
-  if (frame_gen->format != IMGFMT_MPEG && this->enc && this->enc->on_display_frame) {
+  if (frame_gen->format != XINE_IMGFMT_DXR3 && this->enc && this->enc->on_display_frame) {
     if (this->need_update) {
       /* we cannot do this earlier, because vo_frame.duration is only valid here */
       if (this->enc && this->enc->on_update_format)
diff --git a/src/input/input_cda.c b/src/input/input_cda.c
index 4029587c1..3f64984d3 100644
--- a/src/input/input_cda.c
+++ b/src/input/input_cda.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: input_cda.c,v 1.30 2002/09/05 20:19:48 guenter Exp $
+ * $Id: input_cda.c,v 1.31 2002/09/05 20:44:39 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -1782,7 +1782,7 @@ static void cda_plugin_dispose (input_plugin_t *this_gen ) {
 /*
  * Initialize plugin.
  */
-void *init_input_plugin (xine_t *xine, void *data) {
+static void *init_input_plugin (xine_t *xine, void *data) {
   cda_input_plugin_t *this;
   config_values_t    *config;
   int                 i;
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index 6dd6611ef..cadc69e0d 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.c
@@ -18,7 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: input_dvd.c,v 1.74 2002/09/05 20:19:48 guenter Exp $
+ * $Id: input_dvd.c,v 1.75 2002/09/05 20:44:39 mroi Exp $
  *
  */
 
@@ -768,7 +768,7 @@ static buf_element_t *dvdnav_plugin_read_block (input_plugin_t *this_gen,
       break;
      case DVDNAV_HOP_CHANNEL:
        {
-       //flush_buffers(this);
+       flush_buffers(this);
        break;
        }
      case DVDNAV_NAV_PACKET:
@@ -1227,9 +1227,7 @@ static int dvdnav_plugin_get_optional_data (input_plugin_t *this_gen,
 	goto __audio_success;
       }
       
-      /* FIXME: where is xine_get_audio_channel now? */
-      /* channel = (int8_t) xine_get_audio_channel(this->xine); */
-      channel = 0;
+      channel = (int8_t) xine_get_audio_channel(this->xine);
       /*  printf("input_dvd: ********* AUDIO CHANNEL = %d\n", channel); */
       channel = dvdnav_get_audio_logical_stream(this->dvdnav, channel);
       if(channel != -1) {
@@ -1239,15 +1237,11 @@ static int dvdnav_plugin_get_optional_data (input_plugin_t *this_gen,
 	  sprintf(data, " %c%c", lang >> 8, lang & 0xff);
 	} 
 	else {
-      /* FIXME: where is xine_get_audio_channel now? */
-/*	  sprintf(data, "%3i", xine_get_audio_channel(this->xine)); */
-	  sprintf(data, "%3i", 0); 
+	  sprintf(data, "%3i", xine_get_audio_channel(this->xine));
 	}
       } 
       else {
-      /* FIXME: where is xine_get_audio_channel now? */
-/*	channel = xine_get_audio_channel(this->xine); */
-        channel = 0;
+	channel = xine_get_audio_channel(this->xine);
 	sprintf(data, "%3i", channel);
       }
       
@@ -1272,9 +1266,7 @@ static int dvdnav_plugin_get_optional_data (input_plugin_t *this_gen,
 	goto __spu_success;
       }
 
-      /* FIXME: where is xine_get_spu_channel now? */
-      /* channel = (int8_t) xine_get_spu_channel(this->xine);*/
-      channel = 0;
+      channel = (int8_t) xine_get_spu_channel(this->xine);
       /*  printf("input_dvd: ********* SPU CHANNEL = %i\n", channel); */
       if(channel == -1)
 	channel = dvdnav_get_spu_logical_stream(this->dvdnav, this->xine->spu_channel);
@@ -1288,14 +1280,11 @@ static int dvdnav_plugin_get_optional_data (input_plugin_t *this_gen,
 	  sprintf(data, " %c%c", lang >> 8, lang & 0xff);
 	} 
 	else {
-	  /* sprintf(data, "%3i", xine_get_spu_channel(this->xine));*/
-	  sprintf(data, "%3i", 0);
+	  sprintf(data, "%3i", xine_get_spu_channel(this->xine));
 	}
       } 
       else {
-      /* FIXME: where is xine_get_spu_channel now? */
-/*	channel = xine_get_spu_channel(this->xine); */
-        channel = 0;
+	channel = xine_get_spu_channel(this->xine);
 	if(channel == -1)
 	  sprintf(data, "%3s", "off");
 	else
@@ -1395,7 +1384,7 @@ check_solaris_vold_device(dvdnav_input_plugin_t *this)
 }
 #endif
 
-void *init_input_plugin (xine_t *xine, void *data) {
+static void *init_input_plugin (xine_t *xine, void *data) {
   dvdnav_input_plugin_t *this;
   config_values_t *config = xine->config;
   void *dvdcss;
@@ -1508,6 +1497,10 @@ void *init_input_plugin (xine_t *xine, void *data) {
 
 /*
  * $Log: input_dvd.c,v $
+ * Revision 1.75  2002/09/05 20:44:39  mroi
+ * make all the plugin init functions static
+ * (geez this was a job)
+ *
  * Revision 1.74  2002/09/05 20:19:48  guenter
  * use xine_mrl_t instead of mrl_t in input plugins, implement more configfile functions
  *
diff --git a/src/input/input_file.c b/src/input/input_file.c
index 91661f675..cfea3fc55 100644
--- a/src/input/input_file.c
+++ b/src/input/input_file.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: input_file.c,v 1.54 2002/09/05 20:19:49 guenter Exp $
+ * $Id: input_file.c,v 1.55 2002/09/05 20:44:39 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -847,7 +847,7 @@ static void file_plugin_dispose (input_plugin_t *this_gen ) {
   free (this);
 }
 
-void *init_input_plugin (xine_t *xine, void *data) {
+static void *init_input_plugin (xine_t *xine, void *data) {
 
   file_input_plugin_t *this;
   config_values_t     *config;
diff --git a/src/input/input_http.c b/src/input/input_http.c
index 84ffad158..f74506732 100644
--- a/src/input/input_http.c
+++ b/src/input/input_http.c
@@ -685,7 +685,7 @@ static void http_plugin_dispose (input_plugin_t *this_gen ) {
   free (this_gen);
 }
 
-void *init_input_plugin (xine_t *xine, void *data) {
+static void *init_input_plugin (xine_t *xine, void *data) {
 
   http_input_plugin_t *this;
   config_values_t    *config;
diff --git a/src/input/input_mms.c b/src/input/input_mms.c
index d378f880b..07e67bed7 100644
--- a/src/input/input_mms.c
+++ b/src/input/input_mms.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: input_mms.c,v 1.16 2002/09/04 23:31:08 guenter Exp $
+ * $Id: input_mms.c,v 1.17 2002/09/05 20:44:39 mroi Exp $
  *
  * mms input plugin based on work from major mms
  */
@@ -284,7 +284,7 @@ static void mms_plugin_dispose (input_plugin_t *this_gen ) {
   free (this);
 }
 
-void *init_input_plugin (xine_t *xine, void *data) {
+static void *init_input_plugin (xine_t *xine, void *data) {
 
   mms_input_plugin_t *this;
   config_values_t    *config;
diff --git a/src/input/input_net.c b/src/input/input_net.c
index 1b023e38e..00abfa9e5 100644
--- a/src/input/input_net.c
+++ b/src/input/input_net.c
@@ -331,7 +331,7 @@ static void net_plugin_dispose (input_plugin_t *this_gen ) {
   free (this_gen);
 }
 
-void *init_input_plugin (xine_t *xine, void *data) {
+static void *init_input_plugin (xine_t *xine, void *data) {
 
   net_input_plugin_t *this;
   config_values_t    *config;
diff --git a/src/input/input_rtp.c b/src/input/input_rtp.c
index cbce3e7db..d4db61874 100644
--- a/src/input/input_rtp.c
+++ b/src/input/input_rtp.c
@@ -500,10 +500,7 @@ static void rtp_plugin_dispose (input_plugin_t *this_gen ) {
   free (this);
 }
 
-/*
- *
- */
-void *init_input_plugin (xine_t *xine, void *data) {
+static void *init_input_plugin (xine_t *xine, void *data) {
 
   rtp_input_plugin_t *this;
   config_values_t    *config;
diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c
index 4dd3f1116..46c80e283 100644
--- a/src/input/input_stdin_fifo.c
+++ b/src/input/input_stdin_fifo.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: input_stdin_fifo.c,v 1.29 2002/09/04 23:31:08 guenter Exp $
+ * $Id: input_stdin_fifo.c,v 1.30 2002/09/05 20:44:39 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -347,7 +347,7 @@ static void stdin_plugin_dispose (input_plugin_t *this_gen ) {
 }
 
 
-void *init_input_plugin (xine_t *xine, void *data) {
+static void *init_input_plugin (xine_t *xine, void *data) {
 
   stdin_input_plugin_t *this;
   config_values_t      *config;
diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c
index 68138e49d..7ea1cc9e8 100644
--- a/src/input/input_vcd.c
+++ b/src/input/input_vcd.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: input_vcd.c,v 1.48 2002/09/05 20:19:49 guenter Exp $
+ * $Id: input_vcd.c,v 1.49 2002/09/05 20:44:39 mroi Exp $
  *
  */
 
@@ -1135,7 +1135,7 @@ static void vcd_plugin_dispose (input_plugin_t *this_gen ) {
 /*
  *
  */
-void *init_input_plugin (xine_t *xine, void *data) {
+static void *init_input_plugin (xine_t *xine, void *data) {
 
   vcd_input_plugin_t *this;
   config_values_t    *config;
diff --git a/src/liba52/xine_decoder.c b/src/liba52/xine_decoder.c
index 7e5f8c943..a4cb1effc 100644
--- a/src/liba52/xine_decoder.c
+++ b/src/liba52/xine_decoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_decoder.c,v 1.30 2002/09/04 23:31:08 guenter Exp $
+ * $Id: xine_decoder.c,v 1.31 2002/09/05 20:44:39 mroi Exp $
  *
  * stuff needed to turn liba52 into a xine decoder plugin
  */
@@ -534,7 +534,7 @@ static void a52dec_dispose (audio_decoder_t *this_gen) {
   free (this_gen);
 }
 
-void *init_audio_decoder_plugin (xine_t *xine, void *data) {
+static void *init_audio_decoder_plugin (xine_t *xine, void *data) {
 
   a52dec_decoder_t *this ;
   config_values_t *cfg;
diff --git a/src/libdivx4/xine_decoder.c b/src/libdivx4/xine_decoder.c
index b0551549c..3d9c853a4 100644
--- a/src/libdivx4/xine_decoder.c
+++ b/src/libdivx4/xine_decoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_decoder.c,v 1.41 2002/09/04 23:31:09 guenter Exp $
+ * $Id: xine_decoder.c,v 1.42 2002/09/05 20:44:39 mroi Exp $
  *
  * xine decoder plugin using divx4
  *
@@ -546,7 +546,7 @@ static void divx4_dispose(video_decoder_t *this_gen) {
 
 /* This is pretty generic. I took the liberty to increase the
    priority over that of libffmpeg :-) */
-void *init_video_decoder_plugin (xine_t *xine, void *data) {
+static void *init_video_decoder_plugin (xine_t *xine, void *data) {
 
   divx4_decoder_t *this ;
   char *libdecore_name;
diff --git a/src/libdts/xine_decoder.c b/src/libdts/xine_decoder.c
index db137df29..91516d5f0 100644
--- a/src/libdts/xine_decoder.c
+++ b/src/libdts/xine_decoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_decoder.c,v 1.24 2002/09/04 23:31:09 guenter Exp $
+ * $Id: xine_decoder.c,v 1.25 2002/09/05 20:44:40 mroi Exp $
  *
  * 04-09-2001 DTS passtrough  (C) Joachim Koenig 
  * 09-12-2001 DTS passthrough inprovements (C) James Courtier-Dutton
@@ -220,7 +220,7 @@ static void dts_dispose (audio_decoder_t *this_gen) {
   free (this_gen);
 }
 
-void *init_audio_decoder_plugin (xine_t *xine, void *data) {
+static void *init_audio_decoder_plugin (xine_t *xine, void *data) {
 
   dts_decoder_t *this ;
 
diff --git a/src/libfaad/xine_decoder.c b/src/libfaad/xine_decoder.c
index ec3117662..8998a6008 100644
--- a/src/libfaad/xine_decoder.c
+++ b/src/libfaad/xine_decoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_decoder.c,v 1.6 2002/09/04 23:31:09 guenter Exp $
+ * $Id: xine_decoder.c,v 1.7 2002/09/05 20:44:40 mroi Exp $
  *
  */
 
@@ -349,7 +349,7 @@ static void faad_dispose (audio_decoder_t *this_gen) {
   free (this_gen);
 }
 
-void *init_audio_decoder_plugin (xine_t *xine, void *data) {
+static void *init_audio_decoder_plugin (xine_t *xine, void *data) {
 
   faad_decoder_t *this ;
 
diff --git a/src/libffmpeg/xine_decoder.c b/src/libffmpeg/xine_decoder.c
index c8af6b995..9b5871b5b 100644
--- a/src/libffmpeg/xine_decoder.c
+++ b/src/libffmpeg/xine_decoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_decoder.c,v 1.52 2002/09/04 23:31:09 guenter Exp $
+ * $Id: xine_decoder.c,v 1.53 2002/09/05 20:44:40 mroi Exp $
  *
  * xine decoder plugin using ffmpeg
  *
@@ -608,7 +608,7 @@ static void ff_dispose (video_decoder_t *this_gen) {
   free (this_gen);
 }
 
-void *init_video_decoder_plugin (xine_t *xine, void *data) {
+static void *init_video_decoder_plugin (xine_t *xine, void *data) {
 
   ff_decoder_t *this ;
   static pthread_once_t once_control = PTHREAD_ONCE_INIT;
diff --git a/src/liblpcm/xine_decoder.c b/src/liblpcm/xine_decoder.c
index fe210871a..21eb37d93 100644
--- a/src/liblpcm/xine_decoder.c
+++ b/src/liblpcm/xine_decoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_decoder.c,v 1.32 2002/09/04 23:31:09 guenter Exp $
+ * $Id: xine_decoder.c,v 1.33 2002/09/05 20:44:40 mroi Exp $
  * 
  * 31-8-2001 Added LPCM rate sensing.
  *   (c) 2001 James Courtier-Dutton James@superbug.demon.co.uk
@@ -197,7 +197,7 @@ static void lpcm_dispose (audio_decoder_t *this_gen) {
   free (this_gen);
 }
 
-void *init_audio_decoder_plugin (xine_t *xine, void *data) {
+static void *init_audio_decoder_plugin (xine_t *xine, void *data) {
 
   lpcm_decoder_t *this ;
 
diff --git a/src/libmad/xine_decoder.c b/src/libmad/xine_decoder.c
index f3723890e..cef98cbfa 100644
--- a/src/libmad/xine_decoder.c
+++ b/src/libmad/xine_decoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_decoder.c,v 1.24 2002/09/04 23:31:09 guenter Exp $
+ * $Id: xine_decoder.c,v 1.25 2002/09/05 20:44:40 mroi Exp $
  *
  * stuff needed to turn libmad into a xine decoder plugin
  */
@@ -270,7 +270,7 @@ static void mad_dispose (audio_decoder_t *this_gen) {
   free (this_gen);
 }
 
-void *init_audio_decoder_plugin (xine_t *xine, void *data) {
+static void *init_audio_decoder_plugin (xine_t *xine, void *data) {
 
   mad_decoder_t *this ;
 
diff --git a/src/libmpeg2/xine_decoder.c b/src/libmpeg2/xine_decoder.c
index b50f5d823..b7e1e8092 100644
--- a/src/libmpeg2/xine_decoder.c
+++ b/src/libmpeg2/xine_decoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_decoder.c,v 1.38 2002/09/04 23:31:09 guenter Exp $
+ * $Id: xine_decoder.c,v 1.39 2002/09/05 20:44:40 mroi Exp $
  *
  * stuff needed to turn libmpeg2 into a xine decoder plugin
  */
@@ -157,7 +157,7 @@ static void mpeg2dec_dispose (video_decoder_t *this_gen) {
   free (this);
 }
 
-void *init_video_decoder_plugin (xine_t *xine, void *data) {
+static void *init_video_decoder_plugin (xine_t *xine, void *data) {
 
   mpeg2dec_decoder_t *this ;
 
diff --git a/src/libmpg123/xine_decoder.c b/src/libmpg123/xine_decoder.c
index c293980ef..8bb6bd726 100644
--- a/src/libmpg123/xine_decoder.c
+++ b/src/libmpg123/xine_decoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_decoder.c,v 1.8 2002/06/12 12:22:36 f1rmb Exp $
+ * $Id: xine_decoder.c,v 1.9 2002/09/05 20:44:40 mroi Exp $
  *
  * stuff needed to turn libmpg123 into a xine decoder plugin
  */
@@ -101,7 +101,7 @@ static char *mpgdec_get_id(void) {
   return "mpgdec";
 }
 
-audio_decoder_t *init_audio_decoder_plugin (int iface_version, config_values_t *cfg) {
+static void *init_audio_decoder_plugin (int iface_version, config_values_t *cfg) {
 
   mpgdec_decoder_t *this ;
 
diff --git a/src/libspucc/xine_decoder.c b/src/libspucc/xine_decoder.c
index 5fa56c04d..c52d386f7 100644
--- a/src/libspucc/xine_decoder.c
+++ b/src/libspucc/xine_decoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_decoder.c,v 1.16 2002/09/04 23:31:10 guenter Exp $
+ * $Id: xine_decoder.c,v 1.17 2002/09/05 20:44:40 mroi Exp $
  *
  * closed caption spu decoder. receive data by events. 
  *
@@ -380,7 +380,7 @@ static void spudec_dispose (spu_decoder_t *this_gen) {
 }
 
 
-spu_decoder_t *init_spu_decoder_plugin (int iface_version, xine_t *xine) {
+static void *init_spu_decoder_plugin (int iface_version, xine_t *xine) {
 
   spucc_decoder_t *this ;
 
diff --git a/src/libspudec/xine_decoder.c b/src/libspudec/xine_decoder.c
index a72734e00..ebe951995 100644
--- a/src/libspudec/xine_decoder.c
+++ b/src/libspudec/xine_decoder.c
@@ -19,7 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_decoder.c,v 1.73 2002/09/04 23:31:10 guenter Exp $
+ * $Id: xine_decoder.c,v 1.74 2002/09/05 20:44:41 mroi Exp $
  *
  * stuff needed to turn libspu into a xine decoder plugin
  */
@@ -297,7 +297,7 @@ static void spudec_dispose (spu_decoder_t *this_gen) {
   free (this);
 }
 
-spu_decoder_t *init_spu_decoder_plugin (int iface_version, xine_t *xine) {
+static void *init_spu_decoder_plugin (int iface_version, xine_t *xine) {
 
   spudec_decoder_t *this ;
 
diff --git a/src/libsputext/xine_decoder.c b/src/libsputext/xine_decoder.c
index 83acbdf8a..482c3245b 100644
--- a/src/libsputext/xine_decoder.c
+++ b/src/libsputext/xine_decoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_decoder.c,v 1.39 2002/09/04 23:31:10 guenter Exp $
+ * $Id: xine_decoder.c,v 1.40 2002/09/05 20:44:41 mroi Exp $
  *
  * code based on mplayer module:
  *
@@ -1046,7 +1046,7 @@ static void spudec_dispose (spu_decoder_t *this_gen) {
   free (this_gen);
 }
 
-spu_decoder_t *init_spu_decoder_plugin (int iface_version, xine_t *xine) {
+static void *init_spu_decoder_plugin (int iface_version, xine_t *xine) {
 
   sputext_decoder_t *this ;
   static char *subtitle_size_strings[] = { "small", "normal", "large", NULL };
diff --git a/src/libvorbis/xine_decoder.c b/src/libvorbis/xine_decoder.c
index 5999fd85c..bdd726de3 100644
--- a/src/libvorbis/xine_decoder.c
+++ b/src/libvorbis/xine_decoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_decoder.c,v 1.16 2002/09/04 23:31:10 guenter Exp $
+ * $Id: xine_decoder.c,v 1.17 2002/09/05 20:44:41 mroi Exp $
  *
  * (ogg/)vorbis audio decoder plugin (libvorbis wrapper) for xine
  */
@@ -237,7 +237,7 @@ static void vorbis_dispose (audio_decoder_t *this_gen) {
   free (this_gen);
 }
 
-void *init_audio_decoder_plugin (xine_t *xine, void *data) {
+static void *init_audio_decoder_plugin (xine_t *xine, void *data) {
 
   vorbis_decoder_t *this ;
 
diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c
index 6a1b94f85..2e0686879 100644
--- a/src/libw32dll/w32codec.c
+++ b/src/libw32dll/w32codec.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: w32codec.c,v 1.91 2002/09/04 23:31:10 guenter Exp $
+ * $Id: w32codec.c,v 1.92 2002/09/05 20:44:41 mroi Exp $
  *
  * routines for using w32 codecs
  * DirectShow support by Miguel Freitas (Nov/2001)
@@ -1301,7 +1301,7 @@ static void init_routine(void) {
   w32v_init_rgb_ycc();
 }
 
-void *init_video_decoder_plugin (xine_t *xine, void *data) {
+static void *init_video_decoder_plugin (xine_t *xine, void *data) {
 
   w32v_decoder_t *this ;
   config_values_t *cfg;
@@ -1339,7 +1339,7 @@ static void w32a_dispose (audio_decoder_t *this_gen) {
   free (this_gen);
 }
 
-void *init_audio_decoder_plugin (xine_t *xine, void *data) {
+static void *init_audio_decoder_plugin (xine_t *xine, void *data) {
 
   w32a_decoder_t *this ;
   config_values_t *cfg;
diff --git a/src/libxineadec/adpcm.c b/src/libxineadec/adpcm.c
index 24a5d0eaa..b84af1739 100644
--- a/src/libxineadec/adpcm.c
+++ b/src/libxineadec/adpcm.c
@@ -24,7 +24,7 @@
  * formats can be found here:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: adpcm.c,v 1.13 2002/09/04 23:31:10 guenter Exp $
+ * $Id: adpcm.c,v 1.14 2002/09/05 20:44:41 mroi Exp $
  */
 
 #include <stdio.h>
@@ -1134,7 +1134,7 @@ static void adpcm_dispose (audio_decoder_t *this_gen) {
   free (this_gen);
 }
 
-void *init_audio_decoder_plugin (xine_t *xine, void *data) {
+static void *init_audio_decoder_plugin (xine_t *xine, void *data) {
 
   adpcm_decoder_t *this ;
 
diff --git a/src/libxineadec/logpcm.c b/src/libxineadec/logpcm.c
index f755681ba..d36b83aee 100644
--- a/src/libxineadec/logpcm.c
+++ b/src/libxineadec/logpcm.c
@@ -30,7 +30,7 @@
  *   http://sox.sourceforge.net/
  * which listed the code as being lifted from Sun Microsystems.
  *
- * $Id: logpcm.c,v 1.3 2002/09/04 23:31:10 guenter Exp $
+ * $Id: logpcm.c,v 1.4 2002/09/05 20:44:41 mroi Exp $
  *
  */
 
@@ -250,7 +250,7 @@ static void logpcm_dispose (audio_decoder_t *this_gen) {
   free (this_gen);
 }
 
-audio_decoder_t *init_audio_decoder_plugin (int iface_version, xine_t *xine) {
+static void *init_audio_decoder_plugin (int iface_version, xine_t *xine) {
 
   logpcm_decoder_t *this;
   if (iface_version != 9) {
diff --git a/src/libxineadec/roqaudio.c b/src/libxineadec/roqaudio.c
index 49f811f30..2f0b83da4 100644
--- a/src/libxineadec/roqaudio.c
+++ b/src/libxineadec/roqaudio.c
@@ -21,7 +21,7 @@
  * For more information regarding the RoQ file format, visit:
  *   http://www.csse.monash.edu.au/~timf/
  *
- * $Id: roqaudio.c,v 1.5 2002/09/04 23:31:10 guenter Exp $
+ * $Id: roqaudio.c,v 1.6 2002/09/05 20:44:41 mroi Exp $
  *
  */
 
@@ -182,7 +182,7 @@ static void roqaudio_dispose (audio_decoder_t *this_gen) {
   free (this_gen);
 }
 
-void *init_audio_decoder_plugin (xine_t *xine, void *data) {
+static void *init_audio_decoder_plugin (xine_t *xine, void *data) {
 
   roqaudio_decoder_t *this ;
 
diff --git a/src/libxinevdec/cinepak.c b/src/libxinevdec/cinepak.c
index 58b006659..441b464c0 100644
--- a/src/libxinevdec/cinepak.c
+++ b/src/libxinevdec/cinepak.c
@@ -22,7 +22,7 @@
  * based on overview of Cinepak algorithm and example decoder
  * by Tim Ferguson: http://www.csse.monash.edu.au/~timf/
  *
- * $Id: cinepak.c,v 1.12 2002/09/04 23:31:11 guenter Exp $
+ * $Id: cinepak.c,v 1.13 2002/09/05 20:44:41 mroi Exp $
  */
 
 #include <stdlib.h>
@@ -440,7 +440,7 @@ static void cvid_dispose (video_decoder_t *this_gen) {
   free (this_gen);
 }
 
-void *init_video_decoder_plugin (xine_t *xine, void *data) {
+static void *init_video_decoder_plugin (xine_t *xine, void *data) {
 
   cvid_decoder_t *this ;
 
diff --git a/src/libxinevdec/cyuv.c b/src/libxinevdec/cyuv.c
index 79dbdf27f..16aef6bc9 100644
--- a/src/libxinevdec/cyuv.c
+++ b/src/libxinevdec/cyuv.c
@@ -18,7 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: cyuv.c,v 1.6 2002/09/04 23:31:11 guenter Exp $
+ * $Id: cyuv.c,v 1.7 2002/09/05 20:44:41 mroi Exp $
  */
 
 /* And this is the header that came with the CYUV decoder: */
@@ -232,7 +232,7 @@ static void cyuv_dispose (video_decoder_t *this_gen) {
   free (this_gen);
 }
 
-void *init_video_decoder_plugin (xine_t *xine, void *data) {
+static void *init_video_decoder_plugin (xine_t *xine, void *data) {
 
   cyuv_decoder_t *this ;
 
diff --git a/src/libxinevdec/fli.c b/src/libxinevdec/fli.c
index cb3f597ab..662aa4b35 100644
--- a/src/libxinevdec/fli.c
+++ b/src/libxinevdec/fli.c
@@ -23,7 +23,7 @@
  * avoid when implementing a FLI decoder, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  * 
- * $Id: fli.c,v 1.4 2002/09/04 23:31:11 guenter Exp $
+ * $Id: fli.c,v 1.5 2002/09/05 20:44:41 mroi Exp $
  */
 
 #include <stdio.h>
@@ -564,7 +564,7 @@ static void fli_dispose (video_decoder_t *this_gen) {
  * plugins for the same buffer types to coexist peacefully. The higher the
  * priority number, the more precedence a decoder has. E.g., 9 beats 1.
  */
-void *init_video_decoder_plugin (xine_t *xine, void *data) {
+static void *init_video_decoder_plugin (xine_t *xine, void *data) {
 
   fli_decoder_t *this ;
 
diff --git a/src/libxinevdec/foovideo.c b/src/libxinevdec/foovideo.c
index dd02e6b7d..e2cb23c52 100644
--- a/src/libxinevdec/foovideo.c
+++ b/src/libxinevdec/foovideo.c
@@ -20,7 +20,7 @@
  * General description and author credits go here...
  * 
  * Leave the following line intact for when the decoder is committed to CVS:
- * $Id: foovideo.c,v 1.4 2002/09/01 20:45:50 tmmm Exp $
+ * $Id: foovideo.c,v 1.5 2002/09/05 20:44:41 mroi Exp $
  */
 
 #include <stdio.h>
@@ -256,7 +256,7 @@ static void foovideo_dispose (video_decoder_t *this_gen) {
  * plugins for the same buffer types to coexist peacefully. The higher the
  * priority number, the more precedence a decoder has. E.g., 9 beats 1.
  */
-video_decoder_t *init_video_decoder_plugin (int iface_version, xine_t *xine) {
+static void *init_video_decoder_plugin (int iface_version, xine_t *xine) {
 
   foovideo_decoder_t *this ;
 
diff --git a/src/libxinevdec/idcinvideo.c b/src/libxinevdec/idcinvideo.c
index 0147589d1..5273a1160 100644
--- a/src/libxinevdec/idcinvideo.c
+++ b/src/libxinevdec/idcinvideo.c
@@ -21,7 +21,7 @@
  * the Id CIN format, visit:
  *   http://www.csse.monash.edu.au/~timf/
  * 
- * $Id: idcinvideo.c,v 1.3 2002/09/04 23:31:11 guenter Exp $
+ * $Id: idcinvideo.c,v 1.4 2002/09/05 20:44:41 mroi Exp $
  */
 
 #include <stdio.h>
@@ -387,7 +387,7 @@ static void idcinvideo_dispose (video_decoder_t *this_gen) {
  * plugins for the same buffer types to coexist peacefully. The higher the
  * priority number, the more precedence a decoder has. E.g., 9 beats 1.
  */
-video_decoder_t *init_video_decoder_plugin (int iface_version, xine_t *xine) {
+static void *init_video_decoder_plugin (int iface_version, xine_t *xine) {
 
   idcinvideo_decoder_t *this ;
 
diff --git a/src/libxinevdec/msrle.c b/src/libxinevdec/msrle.c
index 006c1d57f..531cf0f1f 100644
--- a/src/libxinevdec/msrle.c
+++ b/src/libxinevdec/msrle.c
@@ -21,7 +21,7 @@
  * For more information on the MS RLE format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  * 
- * $Id: msrle.c,v 1.5 2002/09/04 23:31:11 guenter Exp $
+ * $Id: msrle.c,v 1.6 2002/09/05 20:44:41 mroi Exp $
  */
 
 #include <stdio.h>
@@ -340,7 +340,7 @@ static void msrle_dispose (video_decoder_t *this_gen) {
  * plugins for the same buffer types to coexist peacefully. The higher the
  * priority number, the more precedence a decoder has. E.g., 9 beats 1.
  */
-void *init_video_decoder_plugin (xine_t *xine, void *data) {
+static void *init_video_decoder_plugin (xine_t *xine, void *data) {
 
   msrle_decoder_t *this ;
 
diff --git a/src/libxinevdec/msvc.c b/src/libxinevdec/msvc.c
index fe95de7c5..5ba1d142b 100644
--- a/src/libxinevdec/msvc.c
+++ b/src/libxinevdec/msvc.c
@@ -22,7 +22,7 @@
  * based on overview of Microsoft Video-1 algorithm
  * by Mike Melanson: http://www.pcisys.net/~melanson/codecs/video1.txt
  *
- * $Id: msvc.c,v 1.9 2002/09/04 23:31:11 guenter Exp $
+ * $Id: msvc.c,v 1.10 2002/09/05 20:44:41 mroi Exp $
  */
 
 #include <stdlib.h>
@@ -345,7 +345,7 @@ static void msvc_dispose (video_decoder_t *this_gen) {
   free (this_gen);
 }
 
-void *init_video_decoder_plugin (xine_t *xine, void *data) {
+static void *init_video_decoder_plugin (xine_t *xine, void *data) {
 
   msvc_decoder_t *this ;
 
diff --git a/src/libxinevdec/qtrpza.c b/src/libxinevdec/qtrpza.c
index 6b6f2dfa1..05a0f04ee 100644
--- a/src/libxinevdec/qtrpza.c
+++ b/src/libxinevdec/qtrpza.c
@@ -21,7 +21,7 @@
  * For more information about the RPZA format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: qtrpza.c,v 1.2 2002/09/04 23:31:11 guenter Exp $
+ * $Id: qtrpza.c,v 1.3 2002/09/05 20:44:42 mroi Exp $
  */
 
 #include <stdio.h>
@@ -445,7 +445,7 @@ static void qtrpza_dispose (video_decoder_t *this_gen) {
   free (this_gen);
 }
 
-video_decoder_t *init_video_decoder_plugin (int iface_version, xine_t *xine) {
+static void *init_video_decoder_plugin (int iface_version, xine_t *xine) {
 
   qtrpza_decoder_t *this ;
 
diff --git a/src/libxinevdec/qtsmc.c b/src/libxinevdec/qtsmc.c
index 75c110fe4..3dff56ee1 100644
--- a/src/libxinevdec/qtsmc.c
+++ b/src/libxinevdec/qtsmc.c
@@ -23,7 +23,7 @@
  * For more information on the SMC format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  * 
- * $Id: qtsmc.c,v 1.2 2002/09/04 23:31:11 guenter Exp $
+ * $Id: qtsmc.c,v 1.3 2002/09/05 20:44:42 mroi Exp $
  */
 
 #include <stdio.h>
@@ -677,7 +677,7 @@ static void qtsmc_dispose (video_decoder_t *this_gen) {
   free (this_gen);
 }
 
-video_decoder_t *init_video_decoder_plugin (int iface_version, xine_t *xine) {
+static void *init_video_decoder_plugin (int iface_version, xine_t *xine) {
 
   qtsmc_decoder_t *this ;
 
diff --git a/src/libxinevdec/rgb.c b/src/libxinevdec/rgb.c
index 812afdaa3..29b7d120a 100644
--- a/src/libxinevdec/rgb.c
+++ b/src/libxinevdec/rgb.c
@@ -21,7 +21,7 @@
  * Actually, this decoder just converts a raw RGB image to a YUY2 map
  * suitable for display under xine.
  * 
- * $Id: rgb.c,v 1.5 2002/09/04 23:31:11 guenter Exp $
+ * $Id: rgb.c,v 1.6 2002/09/05 20:44:42 mroi Exp $
  */
 
 #include <stdio.h>
@@ -275,7 +275,7 @@ static void rgb_dispose (video_decoder_t *this_gen) {
   free (this_gen);
 }
 
-void *init_video_decoder_plugin (xine_t *xine, void *data) {
+static void *init_video_decoder_plugin (xine_t *xine, void *data) {
 
   rgb_decoder_t *this ;
 
diff --git a/src/libxinevdec/roqvideo.c b/src/libxinevdec/roqvideo.c
index 95c4d3809..ad0d21096 100644
--- a/src/libxinevdec/roqvideo.c
+++ b/src/libxinevdec/roqvideo.c
@@ -18,7 +18,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: roqvideo.c,v 1.7 2002/09/04 23:31:11 guenter Exp $
+ * $Id: roqvideo.c,v 1.8 2002/09/05 20:44:42 mroi Exp $
  */
 
 /* And this is the header that came with the RoQ video decoder: */
@@ -489,7 +489,7 @@ static void roq_dispose (video_decoder_t *this_gen) {
   free (this_gen);
 }
 
-void *init_video_decoder_plugin (xine_t *xine, void *data) {
+static void *init_video_decoder_plugin (xine_t *xine, void *data) {
 
   roq_decoder_t *this ;
 
diff --git a/src/libxinevdec/svq1.c b/src/libxinevdec/svq1.c
index 8e44612ba..6f1d130e0 100644
--- a/src/libxinevdec/svq1.c
+++ b/src/libxinevdec/svq1.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: svq1.c,v 1.7 2002/09/04 23:31:11 guenter Exp $
+ * $Id: svq1.c,v 1.8 2002/09/05 20:44:42 mroi Exp $
  */
 
 #include <stdio.h>
@@ -1496,7 +1496,7 @@ static void svq1dec_dispose (video_decoder_t *this_gen) {
   free (this_gen);
 }
 
-void *init_video_decoder_plugin (xine_t *xine, void *data) {
+static void *init_video_decoder_plugin (xine_t *xine, void *data) {
 
   svq1dec_decoder_t *this ;
 
diff --git a/src/libxinevdec/wc3video.c b/src/libxinevdec/wc3video.c
index 43ae0a873..a95262da5 100644
--- a/src/libxinevdec/wc3video.c
+++ b/src/libxinevdec/wc3video.c
@@ -22,7 +22,7 @@
  * For more information on the WC3 Movie format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: wc3video.c,v 1.2 2002/09/04 23:31:11 guenter Exp $
+ * $Id: wc3video.c,v 1.3 2002/09/05 20:44:42 mroi Exp $
  */
 
 #include <stdio.h>
@@ -530,7 +530,7 @@ static void wc3video_dispose (video_decoder_t *this_gen) {
  * plugins for the same buffer types to coexist peacefully. The higher the
  * priority number, the more precedence a decoder has. E.g., 9 beats 1.
  */
-video_decoder_t *init_video_decoder_plugin (int iface_version, xine_t *xine) {
+static void *init_video_decoder_plugin (int iface_version, xine_t *xine) {
 
   wc3video_decoder_t *this ;
 
diff --git a/src/libxinevdec/yuv.c b/src/libxinevdec/yuv.c
index 618e4d849..b6976c367 100644
--- a/src/libxinevdec/yuv.c
+++ b/src/libxinevdec/yuv.c
@@ -21,7 +21,7 @@
  * Actually, this decoder just reorganizes chunks of raw YUV data in such
  * a way that xine can display them.
  * 
- * $Id: yuv.c,v 1.4 2002/09/04 23:31:11 guenter Exp $
+ * $Id: yuv.c,v 1.5 2002/09/05 20:44:42 mroi Exp $
  */
 
 #include <stdio.h>
@@ -283,7 +283,7 @@ static void yuv_dispose (video_decoder_t *this_gen) {
  * plugins for the same buffer types to coexist peacefully. The higher the
  * priority number, the more precedence a decoder has. E.g., 9 beats 1.
  */
-void *init_video_decoder_plugin (xine_t *xine, void *data) {
+static void *init_video_decoder_plugin (xine_t *xine, void *data) {
 
   yuv_decoder_t *this ;
 
diff --git a/src/libxvid/xine_decoder.c b/src/libxvid/xine_decoder.c
index 2237798ab..379e07b02 100644
--- a/src/libxvid/xine_decoder.c
+++ b/src/libxvid/xine_decoder.c
@@ -210,7 +210,7 @@ static void xvid_dispose (video_decoder_t *this_gen) {
   free (this_gen);
 }
 
-void *init_video_decoder_plugin (xine_t *xine, void *data) {
+static void *init_video_decoder_plugin (xine_t *xine, void *data) {
     xvid_decoder_t *this;
     XVID_INIT_PARAM xinit;
     
diff --git a/src/video_out/video_out_aa.c b/src/video_out/video_out_aa.c
index 6ebdc0dd7..4241366f3 100644
--- a/src/video_out/video_out_aa.c
+++ b/src/video_out/video_out_aa.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_aa.c,v 1.26 2002/09/04 23:31:12 guenter Exp $
+ * $Id: video_out_aa.c,v 1.27 2002/09/05 20:44:42 mroi Exp $
  *
  * video_out_aa.c, ascii-art output plugin for xine
  *
@@ -265,7 +265,7 @@ static int aa_redraw_needed (vo_driver_t *this_gen) {
   return 0;
 }
 
-vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
+static void *init_video_out_plugin (config_values_t *config, void *visual_gen) {
   aa_driver_t          *this;
 
   this = (aa_driver_t*) malloc (sizeof (aa_driver_t));
diff --git a/src/video_out/video_out_directfb.c b/src/video_out/video_out_directfb.c
index 9f8a9e1b9..9c01d12fe 100644
--- a/src/video_out/video_out_directfb.c
+++ b/src/video_out/video_out_directfb.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_directfb.c,v 1.13 2002/08/10 21:25:20 miguelfreitas Exp $
+ * $Id: video_out_directfb.c,v 1.14 2002/09/05 20:44:42 mroi Exp $
  *
  * DirectFB based output plugin.
  * Rich Wareham <richwareham@users.sourceforge.net>
@@ -507,7 +507,7 @@ typedef struct {
   IDirectFBDisplayLayer *video_layer;
 } dfb_visual_info_t;
 
-vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
+static void *init_video_out_plugin (config_values_t *config, void *visual_gen) {
 
   directfb_driver_t      *this;
   dfb_visual_info_t      *visual_info = (dfb_visual_info_t*)visual_gen;
diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c
index a6b0b43c1..bf113ff01 100644
--- a/src/video_out/video_out_fb.c
+++ b/src/video_out/video_out_fb.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_fb.c,v 1.16 2002/09/04 23:31:12 guenter Exp $
+ * $Id: video_out_fb.c,v 1.17 2002/09/05 20:44:42 mroi Exp $
  * 
  * video_out_fb.c, frame buffer xine driver by Miguel Freitas
  *
@@ -534,7 +534,7 @@ static void fb_exit (xine_vo_driver_t *this_gen) {
   close(this->fd);
 }
 
-xine_vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
+static void *init_video_out_plugin (config_values_t *config, void *visual_gen) {
 
   fb_driver_t        *this;
   int                mode;
diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c
index 2a504b9c0..599ee7482 100644
--- a/src/video_out/video_out_opengl.c
+++ b/src/video_out/video_out_opengl.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_opengl.c,v 1.17 2002/09/04 23:31:12 guenter Exp $
+ * $Id: video_out_opengl.c,v 1.18 2002/09/05 20:44:42 mroi Exp $
  * 
  * video_out_glut.c, glut based OpenGL rendering interface for xine
  * Matthias Hopf <mat@mshopf.de>
@@ -1036,7 +1036,7 @@ static void opengl_exit (vo_driver_t *this_gen) {
 }
 
 
-vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
+static void *init_video_out_plugin (config_values_t *config, void *visual_gen) {
 
     opengl_driver_t      *this;
     x11_visual_t         *visual = (x11_visual_t *) visual_gen;
diff --git a/src/video_out/video_out_pgx64.c b/src/video_out/video_out_pgx64.c
index 04418e359..cc3d6b72b 100644
--- a/src/video_out/video_out_pgx64.c
+++ b/src/video_out/video_out_pgx64.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  *
- * $Id: video_out_pgx64.c,v 1.2 2002/09/04 00:37:53 komadori Exp $
+ * $Id: video_out_pgx64.c,v 1.3 2002/09/05 20:44:42 mroi Exp $
  *
  * video_out_pgx64.c, Sun PGX64/PGX24 output plugin for xine
  *
@@ -645,7 +645,7 @@ static void pgx64_exit(pgx64_driver_t *this)
   close(this->fbfd);
 }
 
-pgx64_driver_t* init_video_out_plugin(config_values_t *config, void *visual_gen) {
+static void* init_video_out_plugin(config_values_t *config, void *visual_gen) {
   pgx64_driver_t *this;
   char *devname;
   int fbfd;
diff --git a/src/video_out/video_out_sdl.c b/src/video_out/video_out_sdl.c
index 98b107892..994e7e371 100644
--- a/src/video_out/video_out_sdl.c
+++ b/src/video_out/video_out_sdl.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_sdl.c,v 1.13 2002/09/04 23:31:12 guenter Exp $
+ * $Id: video_out_sdl.c,v 1.14 2002/09/05 20:44:42 mroi Exp $
  * 
  * video_out_sdl.c, Simple DirectMedia Layer
  *
@@ -429,7 +429,7 @@ static void sdl_exit (xine_vo_driver_t *this_gen) {
   SDL_QuitSubSystem (SDL_INIT_VIDEO);
 }
 
-xine_vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
+static void *init_video_out_plugin (config_values_t *config, void *visual_gen) {
 
   sdl_driver_t          *this;
   const SDL_VideoInfo * vidInfo;
diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c
index 7465dcf26..2c1e79b9e 100644
--- a/src/video_out/video_out_syncfb.c
+++ b/src/video_out/video_out_syncfb.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_syncfb.c,v 1.77 2002/09/04 23:31:12 guenter Exp $
+ * $Id: video_out_syncfb.c,v 1.78 2002/09/05 20:44:42 mroi Exp $
  * 
  * video_out_syncfb.c, SyncFB (for Matrox G200/G400 cards) interface for xine
  * 
@@ -803,7 +803,7 @@ static void syncfb_exit(xine_vo_driver_t *this_gen)
   close(this->fd);
 }
 
-xine_vo_driver_t *init_video_out_plugin(config_values_t *config, void *visual_gen)
+static void *init_video_out_plugin(config_values_t *config, void *visual_gen)
 {
    syncfb_driver_t*  this;
    Display*          display = NULL; 
diff --git a/src/video_out/video_out_vidix.c b/src/video_out/video_out_vidix.c
index 9262f14b0..515cbcdcf 100644
--- a/src/video_out/video_out_vidix.c
+++ b/src/video_out/video_out_vidix.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_vidix.c,v 1.11 2002/09/04 23:31:12 guenter Exp $
+ * $Id: video_out_vidix.c,v 1.12 2002/09/05 20:44:42 mroi Exp $
  * 
  * video_out_vidix.c
  *
@@ -661,7 +661,7 @@ static void vidix_exit (vo_driver_t *this_gen) {
   vdlClose(this->vidix_handler);
 }
 
-vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
+static void *init_video_out_plugin (config_values_t *config, void *visual_gen) {
 
   vidix_driver_t          *this;
   x11_visual_t         *visual = (x11_visual_t *) visual_gen;
diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c
index f202d6d95..6a3743f42 100644
--- a/src/video_out/video_out_xshm.c
+++ b/src/video_out/video_out_xshm.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_xshm.c,v 1.87 2002/09/04 23:31:12 guenter Exp $
+ * $Id: video_out_xshm.c,v 1.88 2002/09/05 20:44:42 mroi Exp $
  * 
  * video_out_xshm.c, X11 shared memory extension interface for xine
  *
@@ -996,7 +996,7 @@ static char *visual_class_name(Visual *visual) {
   }
 }
 
-xine_vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) {
+static void *init_video_out_plugin (config_values_t *config, void *visual_gen) {
 
   xshm_driver_t        *this;
   x11_visual_t         *visual = (x11_visual_t *) visual_gen;
diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c
index 015c18757..410bbbdb6 100644
--- a/src/video_out/video_out_xv.c
+++ b/src/video_out/video_out_xv.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_out_xv.c,v 1.129 2002/09/04 23:31:12 guenter Exp $
+ * $Id: video_out_xv.c,v 1.130 2002/09/05 20:44:42 mroi Exp $
  * 
  * video_out_xv.c, X11 video extension interface for xine
  *
@@ -1052,7 +1052,7 @@ static void xv_update_XV_DOUBLE_BUFFER(void *this_gen, xine_cfg_entry_t *entry)
 }
 
 
-void *init_video_out_plugin (xine_t *xine, void *visual_gen) {
+static void *init_video_out_plugin (xine_t *xine, void *visual_gen) {
 
   config_values_t      *config = xine->config;
   xv_driver_t          *this;