Reduce GCC verbosity (various prototype declaration fixes). ffmpeg, wine and fft*post are untouched (fft: for now).

CVS patchset: 5310
CVS date: 2003/08/25 21:51:37

87 files changed, 341 insertions, 286 deletions

diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am
index ad95694d2..661b46923 100644
--- a/src/demuxers/Makefile.am
+++ b/src/demuxers/Makefile.am
@@ -137,4 +137,4 @@ xineplug_dmx_nsv_la_LIBADD = $(XINE_LIB)
 xineplug_dmx_nsv_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 include_HEADERS = demux.h
-noinst_HEADERS = asfheader.h qtpalette.h
+noinst_HEADERS = asfheader.h qtpalette.h group_games.h group_audio.h
diff --git a/src/demuxers/demux_4xm.c b/src/demuxers/demux_4xm.c
index 49e18fb4b..1edd6f0d3 100644
--- a/src/demuxers/demux_4xm.c
+++ b/src/demuxers/demux_4xm.c
@@ -23,7 +23,7 @@
  * For more information on the 4xm file format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: demux_4xm.c,v 1.4 2003/07/16 00:52:45 andruil Exp $
+ * $Id: demux_4xm.c,v 1.5 2003/08/25 21:51:38 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -46,6 +46,7 @@
 #include "compat.h"
 #include "demux.h"
 #include "bswap.h"
+#include "group_games.h"
 
 #define FOURCC_TAG( ch0, ch1, ch2, ch3 ) \
         ( (long)(unsigned char)(ch0) | \
diff --git a/src/demuxers/demux_ac3.c b/src/demuxers/demux_ac3.c
index b5e50d174..6c3d693b1 100644
--- a/src/demuxers/demux_ac3.c
+++ b/src/demuxers/demux_ac3.c
@@ -23,7 +23,7 @@
  * This demuxer detects raw AC3 data in a file and shovels AC3 data
  * directly to the AC3 decoder.
  *
- * $Id: demux_ac3.c,v 1.9 2003/07/16 00:52:45 andruil Exp $
+ * $Id: demux_ac3.c,v 1.10 2003/08/25 21:51:38 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -42,6 +42,7 @@
 #include "demux.h"
 #include "buffer.h"
 #include "bswap.h"
+#include "group_audio.h"
 
 #define AC3_PREAMBLE_BYTES 5
 
diff --git a/src/demuxers/demux_aiff.c b/src/demuxers/demux_aiff.c
index 3d0b2015f..bcc352845 100644
--- a/src/demuxers/demux_aiff.c
+++ b/src/demuxers/demux_aiff.c
@@ -21,7 +21,7 @@
 /*
  * AIFF File Demuxer by Mike Melanson (melanson@pcisys.net)
  *
- * $Id: demux_aiff.c,v 1.31 2003/07/16 00:52:45 andruil Exp $
+ * $Id: demux_aiff.c,v 1.32 2003/08/25 21:51:38 f1rmb Exp $
  *
  */
 
@@ -41,6 +41,7 @@
 #include "demux.h"
 #include "buffer.h"
 #include "bswap.h"
+#include "group_audio.h"
 
 #define FOURCC_TAG( ch0, ch1, ch2, ch3 ) \
         ( (long)(unsigned char)(ch3) | \
diff --git a/src/demuxers/demux_aud.c b/src/demuxers/demux_aud.c
index a3298ff84..a2f1354b2 100644
--- a/src/demuxers/demux_aud.c
+++ b/src/demuxers/demux_aud.c
@@ -34,7 +34,7 @@
  * data. This makes seeking conceptually impossible. Upshot: Random
  * seeking is not supported.
  *
- * $Id: demux_aud.c,v 1.10 2003/07/16 00:52:45 andruil Exp $
+ * $Id: demux_aud.c,v 1.11 2003/08/25 21:51:38 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -52,6 +52,7 @@
 #include "compat.h"
 #include "demux.h"
 #include "bswap.h"
+#include "group_audio.h"
 
 #define AUD_HEADER_SIZE 12
 #define AUD_CHUNK_PREAMBLE_SIZE 8
diff --git a/src/demuxers/demux_cdda.c b/src/demuxers/demux_cdda.c
index 1c6e63394..2c20b3fb0 100644
--- a/src/demuxers/demux_cdda.c
+++ b/src/demuxers/demux_cdda.c
@@ -24,7 +24,7 @@
  * linear PCM "decoder" (which in turn sends them directly to the audio
  * output target; this is a really fancy CD-playing architecture).
  *
- * $Id: demux_cdda.c,v 1.11 2003/08/10 16:11:05 miguelfreitas Exp $
+ * $Id: demux_cdda.c,v 1.12 2003/08/25 21:51:38 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -48,6 +48,7 @@
 #include "demux.h"
 #include "buffer.h"
 #include "bswap.h"
+#include "group_audio.h"
 
 /* 44100 samples/sec * 2 bytes/samples * 2 channels */
 #define CD_BYTES_PER_SECOND (44100 * 2 * 2)
diff --git a/src/demuxers/demux_eawve.c b/src/demuxers/demux_eawve.c
index 3949d2a5c..f2cbf79dd 100644
--- a/src/demuxers/demux_eawve.c
+++ b/src/demuxers/demux_eawve.c
@@ -19,7 +19,7 @@
  */
 
 /*
- * $Id: demux_eawve.c,v 1.19 2003/07/25 21:02:05 miguelfreitas Exp $
+ * $Id: demux_eawve.c,v 1.20 2003/08/25 21:51:38 f1rmb Exp $
  *
  * demux_eawve.c, Demuxer plugin for Electronic Arts' WVE file format
  *
@@ -44,6 +44,7 @@
 #include "xineutils.h"
 #include "bswap.h"
 #include "demux.h"
+#include "group_games.h"
 
 #define FOURCC_TAG(ch0, ch1, ch2, ch3) \
                  (((uint32_t)(ch3)) | \
@@ -422,7 +423,7 @@ static void class_dispose(demux_class_t *this){
   free(this);
 }
 
-void *demux_eawve_init_plugin(xine_t *xine, void *data){
+void *demux_eawve_init_plugin(xine_t *xine, void *data) {
   demux_eawve_class_t     *this;
 
   this = xine_xmalloc(sizeof(demux_eawve_class_t));
@@ -436,10 +437,3 @@ void *demux_eawve_init_plugin(xine_t *xine, void *data){
 
   return this;
 }
-
-#if 0
-plugin_info_t xine_plugin_info[] = {
-  { PLUGIN_DEMUX, 22, "wve", XINE_VERSION_CODE, NULL, (void*)demux_eawve_init_plugin},
-  { PLUGIN_NONE, 0, "", 0, NULL, NULL }
-};
-#endif
diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c
index 38542de69..afc6077d5 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.64 2003/07/25 21:02:05 miguelfreitas Exp $
+ * $Id: demux_film.c,v 1.65 2003/08/25 21:51:38 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -51,6 +51,7 @@
 #include "compat.h"
 #include "demux.h"
 #include "bswap.h"
+#include "group_games.h"
 
 #define FOURCC_TAG( ch0, ch1, ch2, ch3 )                                \
         ( (long)(unsigned char)(ch3) | ( (long)(unsigned char)(ch2) << 8 ) | \
diff --git a/src/demuxers/demux_idcin.c b/src/demuxers/demux_idcin.c
index 37cd096cb..02dae326a 100644
--- a/src/demuxers/demux_idcin.c
+++ b/src/demuxers/demux_idcin.c
@@ -65,7 +65,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.42 2003/07/25 21:02:05 miguelfreitas Exp $
+ * $Id: demux_idcin.c,v 1.43 2003/08/25 21:51:38 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -91,6 +91,7 @@
 #include "compat.h"
 #include "demux.h"
 #include "bswap.h"
+#include "group_games.h"
 
 #define IDCIN_HEADER_SIZE 20
 #define HUFFMAN_TABLE_SIZE 65536
@@ -554,15 +555,3 @@ void *demux_idcin_init_plugin (xine_t *xine, void *data) {
 
   return this;
 }
-
-/*
- * exported plugin catalog entry
- */
-
-#if 0
-plugin_info_t xine_plugin_info[] = {
-  /* type, API, "name", version, special_info, init_function */  
-  { PLUGIN_DEMUX, 22, "idcin", XINE_VERSION_CODE, NULL, demux_idcin_init_plugin },
-  { PLUGIN_NONE, 0, "", 0, NULL, NULL }
-};
-#endif
diff --git a/src/demuxers/demux_ipmovie.c b/src/demuxers/demux_ipmovie.c
index a99727e66..7ce6d148a 100644
--- a/src/demuxers/demux_ipmovie.c
+++ b/src/demuxers/demux_ipmovie.c
@@ -23,7 +23,7 @@
  * For more information regarding the Interplay MVE file format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: demux_ipmovie.c,v 1.12 2003/07/25 21:02:05 miguelfreitas Exp $
+ * $Id: demux_ipmovie.c,v 1.13 2003/08/25 21:51:38 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -46,6 +46,7 @@
 #include "compat.h"
 #include "demux.h"
 #include "bswap.h"
+#include "group_games.h"
 
 #define IPMOVIE_SIGNATURE "Interplay MVE File\x1A\0"
 #define IPMOVIE_SIGNATURE_SIZE 20
@@ -732,15 +733,3 @@ void *demux_ipmovie_init_plugin (xine_t *xine, void *data) {
 
   return this;
 }
-
-/*
- * exported plugin catalog entry
- */
-
-#if 0
-plugin_info_t xine_plugin_info[] = {
-  /* type, API, "name", version, special_info, init_function */
-  { PLUGIN_DEMUX, 22, "ipmovie", XINE_VERSION_CODE, NULL, demux_ipmovie_init_plugin },
-  { PLUGIN_NONE, 0, "", 0, NULL, NULL }
-};
-#endif
diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c
index 9127f76f7..d64334972 100644
--- a/src/demuxers/demux_mpgaudio.c
+++ b/src/demuxers/demux_mpgaudio.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_mpgaudio.c,v 1.105 2003/08/10 16:03:21 miguelfreitas Exp $
+ * $Id: demux_mpgaudio.c,v 1.106 2003/08/25 21:51:38 f1rmb Exp $
  *
  * demultiplexer for mpeg audio (i.e. mp3) streams
  *
@@ -38,6 +38,7 @@
 #include "compat.h"
 #include "demux.h"
 #include "bswap.h"
+#include "group_audio.h"
 
 /*
 #define LOG
@@ -883,17 +884,3 @@ void *demux_mpgaudio_init_class (xine_t *xine, void *data) {
 
   return this;
 }
-
-
-
-/*
- * exported plugin catalog entry
- */
-
-#if 0
-plugin_info_t xine_plugin_info[] = {
-  /* type, API, "name", version, special_info, init_function */  
-  { PLUGIN_DEMUX, 22, "mp3", XINE_VERSION_CODE, NULL, demux_mpgaudio_init_class },
-  { PLUGIN_NONE, 0, "", 0, NULL, NULL }
-};
-#endif
diff --git a/src/demuxers/demux_nsf.c b/src/demuxers/demux_nsf.c
index 7d0ac49bc..5aa75b9d1 100644
--- a/src/demuxers/demux_nsf.c
+++ b/src/demuxers/demux_nsf.c
@@ -30,7 +30,7 @@
  * For more information regarding the NSF format, visit:
  *   http://www.tripoint.org/kevtris/nes/nsfspec.txt
  *
- * $Id: demux_nsf.c,v 1.14 2003/07/16 00:52:45 andruil Exp $
+ * $Id: demux_nsf.c,v 1.15 2003/08/25 21:51:38 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -53,6 +53,7 @@
 #include "compat.h"
 #include "demux.h"
 #include "bswap.h"
+#include "group_audio.h"
 
 #define NSF_HEADER_SIZE 0x80
 #define NSF_SAMPLERATE 44100
diff --git a/src/demuxers/demux_nsv.c b/src/demuxers/demux_nsv.c
index 51d24f09a..2f05e0b24 100644
--- a/src/demuxers/demux_nsv.c
+++ b/src/demuxers/demux_nsv.c
@@ -23,7 +23,7 @@
  * For more information regarding the NSV file format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: demux_nsv.c,v 1.4 2003/07/25 21:02:05 miguelfreitas Exp $
+ * $Id: demux_nsv.c,v 1.5 2003/08/25 21:51:38 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -478,7 +478,7 @@ static void class_dispose (demux_class_t *this_gen) {
   free (this);
 }
 
-void *demux_nsv_init_plugin (xine_t *xine, void *data) {
+static void *demux_nsv_init_plugin (xine_t *xine, void *data) {
   demux_nsv_class_t     *this;
 
   this = xine_xmalloc (sizeof (demux_nsv_class_t));
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c
index 81124885d..8131ee183 100644
--- a/src/demuxers/demux_qt.c
+++ b/src/demuxers/demux_qt.c
@@ -30,7 +30,7 @@
  *    build_frame_table
  *  free_qt_info
  *
- * $Id: demux_qt.c,v 1.164 2003/07/25 21:02:05 miguelfreitas Exp $
+ * $Id: demux_qt.c,v 1.165 2003/08/25 21:51:38 f1rmb Exp $
  *
  */
 
@@ -571,7 +571,7 @@ static void find_moov_atom(input_plugin_t *input, off_t *moov_offset,
 }
 
 /* create a qt_info structure or return NULL if no memory */
-qt_info *create_qt_info(void) {
+static qt_info *create_qt_info(void) {
   qt_info *info;
 
   info = (qt_info *)xine_xmalloc(sizeof(qt_info));
@@ -609,7 +609,7 @@ qt_info *create_qt_info(void) {
 }
 
 /* release a qt_info structure and associated data */
-void free_qt_info(qt_info *info) {
+static void free_qt_info(qt_info *info) {
 
   int i, j;
 
diff --git a/src/demuxers/demux_realaudio.c b/src/demuxers/demux_realaudio.c
index 843d78115..e3c47a9e5 100644
--- a/src/demuxers/demux_realaudio.c
+++ b/src/demuxers/demux_realaudio.c
@@ -21,7 +21,7 @@
 /*
  * RealAudio File Demuxer by Mike Melanson (melanson@pcisys.net)
  *
- * $Id: demux_realaudio.c,v 1.21 2003/07/16 00:52:45 andruil Exp $
+ * $Id: demux_realaudio.c,v 1.22 2003/08/25 21:51:38 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -40,6 +40,7 @@
 #include "demux.h"
 #include "buffer.h"
 #include "bswap.h"
+#include "group_audio.h"
 
 #define RA_FILE_HEADER_SIZE 16
 #define RA_AUDIO_HEADER_SIZE 0x39
diff --git a/src/demuxers/demux_roq.c b/src/demuxers/demux_roq.c
index 83b097b7f..cd27fbdae 100644
--- a/src/demuxers/demux_roq.c
+++ b/src/demuxers/demux_roq.c
@@ -23,7 +23,7 @@
  * For more information regarding the RoQ file format, visit:
  *   http://www.csse.monash.edu.au/~timf/
  *
- * $Id: demux_roq.c,v 1.41 2003/07/25 21:02:05 miguelfreitas Exp $
+ * $Id: demux_roq.c,v 1.42 2003/08/25 21:51:38 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -46,6 +46,7 @@
 #include "compat.h"
 #include "demux.h"
 #include "bswap.h"
+#include "group_games.h"
 
 #define RoQ_MAGIC_NUMBER 0x1084
 #define RoQ_CHUNK_PREAMBLE_SIZE 8
@@ -486,15 +487,3 @@ void *demux_roq_init_plugin (xine_t *xine, void *data) {
 
   return this;
 }
-
-/*
- * exported plugin catalog entry
- */
-
-#if 0
-plugin_info_t xine_plugin_info[] = {
-  /* type, API, "name", version, special_info, init_function */
-  { PLUGIN_DEMUX, 22, "roq", XINE_VERSION_CODE, NULL, demux_roq_init_plugin },
-  { PLUGIN_NONE, 0, "", 0, NULL, NULL }
-};
-#endif
diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c
index 44e35d1d8..a3e9d3b74 100644
--- a/src/demuxers/demux_smjpeg.c
+++ b/src/demuxers/demux_smjpeg.c
@@ -23,7 +23,7 @@
  * For more information on the SMJPEG file format, visit:
  *   http://www.lokigames.com/development/smjpeg.php3
  *
- * $Id: demux_smjpeg.c,v 1.40 2003/07/16 00:52:45 andruil Exp $
+ * $Id: demux_smjpeg.c,v 1.41 2003/08/25 21:51:38 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -46,6 +46,7 @@
 #include "compat.h"
 #include "demux.h"
 #include "bswap.h"
+#include "group_games.h"
 
 #define FOURCC_TAG( ch0, ch1, ch2, ch3 )                                \
         ( (long)(unsigned char)(ch3) | ( (long)(unsigned char)(ch2) << 8 ) | \
diff --git a/src/demuxers/demux_snd.c b/src/demuxers/demux_snd.c
index 3fd2af0a8..6f83ac447 100644
--- a/src/demuxers/demux_snd.c
+++ b/src/demuxers/demux_snd.c
@@ -21,7 +21,7 @@
 /*
  * SND/AU File Demuxer by Mike Melanson (melanson@pcisys.net)
  *
- * $Id: demux_snd.c,v 1.31 2003/07/16 00:52:45 andruil Exp $
+ * $Id: demux_snd.c,v 1.32 2003/08/25 21:51:39 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -40,6 +40,7 @@
 #include "demux.h"
 #include "buffer.h"
 #include "bswap.h"
+#include "group_audio.h"
 
 #define SND_HEADER_SIZE 24
 #define PCM_BLOCK_ALIGN 1024
diff --git a/src/demuxers/demux_str.c b/src/demuxers/demux_str.c
index bc3d45377..eb596f84b 100644
--- a/src/demuxers/demux_str.c
+++ b/src/demuxers/demux_str.c
@@ -24,7 +24,7 @@
  * This demuxer handles either raw STR files (which are just a concatenation
  * of raw compact disc sectors) or STR files with RIFF headers.
  *
- * $Id: demux_str.c,v 1.14 2003/07/25 21:02:05 miguelfreitas Exp $
+ * $Id: demux_str.c,v 1.15 2003/08/25 21:51:39 f1rmb Exp $
  */
 
 /*
@@ -129,6 +129,7 @@
 #include "compat.h"
 #include "demux.h"
 #include "bswap.h"
+#include "group_games.h"
 
 /* There may be a RIFF/CDXA header at the beginning of the file, which
  * accounts for 0x2C bytes.  We need at most 0x30 bytes of the sector to
@@ -643,15 +644,3 @@ void *demux_str_init_plugin (xine_t *xine, void *data) {
 
   return this;
 }
-
-/*
- * exported plugin catalog entry
- */
-
-#if 0
-plugin_info_t xine_plugin_info[] = {
-  /* type, API, "name", version, special_info, init_function */
-  { PLUGIN_DEMUX, 22, "str", XINE_VERSION_CODE, NULL, demux_str_init_plugin },
-  { PLUGIN_NONE, 0, "", 0, NULL, NULL }
-};
-#endif
diff --git a/src/demuxers/demux_voc.c b/src/demuxers/demux_voc.c
index 974dd1d60..9a08a126d 100644
--- a/src/demuxers/demux_voc.c
+++ b/src/demuxers/demux_voc.c
@@ -25,7 +25,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.31 2003/07/16 00:52:45 andruil Exp $
+ * $Id: demux_voc.c,v 1.32 2003/08/25 21:51:39 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -44,6 +44,7 @@
 #include "demux.h"
 #include "buffer.h"
 #include "bswap.h"
+#include "group_audio.h"
 
 #define PCM_BLOCK_ALIGN 1024
 #define VOC_HEADER_SIZE 0x1A
diff --git a/src/demuxers/demux_vox.c b/src/demuxers/demux_vox.c
index 9027d716a..152671811 100644
--- a/src/demuxers/demux_vox.c
+++ b/src/demuxers/demux_vox.c
@@ -22,7 +22,7 @@
  * VOX Demuxer by Mike Melanson (melanson@pcisys.net)
  * This a demuxer for .vox files containing raw Dialogic ADPCM data.
  *
- * $Id: demux_vox.c,v 1.6 2003/07/16 00:52:45 andruil Exp $
+ * $Id: demux_vox.c,v 1.7 2003/08/25 21:51:39 f1rmb Exp $
  *
  */
 
@@ -42,6 +42,7 @@
 #include "demux.h"
 #include "buffer.h"
 #include "bswap.h"
+#include "group_audio.h"
 
 #define DIALOGIC_SAMPLERATE 8000
 
diff --git a/src/demuxers/demux_vqa.c b/src/demuxers/demux_vqa.c
index 4c007b149..d7a40c144 100644
--- a/src/demuxers/demux_vqa.c
+++ b/src/demuxers/demux_vqa.c
@@ -29,7 +29,7 @@
  * block needs information from the previous audio block in order to be
  * decoded, thus making random seeking difficult.
  *
- * $Id: demux_vqa.c,v 1.31 2003/07/25 21:02:05 miguelfreitas Exp $
+ * $Id: demux_vqa.c,v 1.32 2003/08/25 21:51:39 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -47,6 +47,7 @@
 #include "compat.h"
 #include "demux.h"
 #include "bswap.h"
+#include "group_games.h"
 
 #define FOURCC_TAG( ch0, ch1, ch2, ch3 ) \
         ( (long)(unsigned char)(ch3) | \
@@ -424,15 +425,3 @@ void *demux_vqa_init_plugin (xine_t *xine, void *data) {
 
   return this;
 }
-
-/*
- * exported plugin catalog entry
- */
-
-#if 0
-plugin_info_t xine_plugin_info[] = {
-  /* type, API, "name", version, special_info, init_function */
-  { PLUGIN_DEMUX, 22, "vqa", XINE_VERSION_CODE, NULL, demux_vqa_init_plugin },
-  { PLUGIN_NONE, 0, "", 0, NULL, NULL }
-};
-#endif
diff --git a/src/demuxers/demux_wav.c b/src/demuxers/demux_wav.c
index 34fc85d90..d318c5998 100644
--- a/src/demuxers/demux_wav.c
+++ b/src/demuxers/demux_wav.c
@@ -22,7 +22,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.45 2003/08/16 20:15:55 jcdutton Exp $
+ * $Id: demux_wav.c,v 1.46 2003/08/25 21:51:39 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -41,6 +41,7 @@
 #include "demux.h"
 #include "buffer.h"
 #include "bswap.h"
+#include "group_audio.h"
 
 #define WAV_SIGNATURE_SIZE 16
 /* this is the hex value for 'data' */
diff --git a/src/demuxers/demux_wc3movie.c b/src/demuxers/demux_wc3movie.c
index d25a74476..643f99ff5 100644
--- a/src/demuxers/demux_wc3movie.c
+++ b/src/demuxers/demux_wc3movie.c
@@ -24,7 +24,7 @@
  * For more information on the MVE file format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: demux_wc3movie.c,v 1.39 2003/07/25 21:02:05 miguelfreitas Exp $
+ * $Id: demux_wc3movie.c,v 1.40 2003/08/25 21:51:39 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -47,6 +47,7 @@
 #include "compat.h"
 #include "demux.h"
 #include "bswap.h"
+#include "group_games.h"
 
 #define FOURCC_TAG( ch0, ch1, ch2, ch3 ) \
         ( (long)(unsigned char)(ch3) | \
@@ -748,15 +749,3 @@ void *demux_wc3movie_init_plugin (xine_t *xine, void *data) {
 
   return this;
 }
-
-/*
- * exported plugin catalog entry
- */
-
-#if 0
-plugin_info_t xine_plugin_info[] = {
-  /* type, API, "name", version, special_info, init_function */  
-  { PLUGIN_DEMUX, 22, "wc3movie", XINE_VERSION_CODE, NULL, demux_wc3movie_init_plugin },
-  { PLUGIN_NONE, 0, "", 0, NULL, NULL }
-};
-#endif
diff --git a/src/demuxers/group_audio.c b/src/demuxers/group_audio.c
index 2880f587c..4c1d5b419 100644
--- a/src/demuxers/group_audio.c
+++ b/src/demuxers/group_audio.c
@@ -19,7 +19,7 @@
  *
  * This file contains plugin entries for several demuxers used in games
  *
- * $Id: group_audio.c,v 1.7 2003/07/25 21:02:05 miguelfreitas Exp $
+ * $Id: group_audio.c,v 1.8 2003/08/25 21:51:39 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -29,18 +29,7 @@
 #include "xine_internal.h"
 #include "demux.h"
 
-
-void *demux_ac3_init_plugin (xine_t *xine, void *data);
-void *demux_aud_init_plugin (xine_t *xine, void *data);
-void *demux_aiff_init_plugin (xine_t *xine, void *data);
-void *demux_cdda_init_plugin (xine_t *xine, void *data);
-void *demux_mpgaudio_init_class (xine_t *xine, void *data);
-void *demux_nsf_init_plugin (xine_t *xine, void *data);
-void *demux_realaudio_init_plugin (xine_t *xine, void *data);
-void *demux_snd_init_plugin (xine_t *xine, void *data);
-void *demux_voc_init_plugin (xine_t *xine, void *data);
-void *demux_vox_init_plugin (xine_t *xine, void *data);
-void *demux_wav_init_plugin (xine_t *xine, void *data);
+#include "group_audio.h"
 
 /*
  * exported plugin catalog entries
diff --git a/src/demuxers/group_audio.h b/src/demuxers/group_audio.h
new file mode 100644
index 000000000..3d3061d12
--- /dev/null
+++ b/src/demuxers/group_audio.h
@@ -0,0 +1,40 @@
+/* 
+ * Copyright (C) 2000-2002 the xine project
+ * 
+ * This file is part of xine, a free video player.
+ * 
+ * xine is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * xine is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ *
+ * $Id: group_audio.h,v 1.1 2003/08/25 21:51:39 f1rmb Exp $
+ */
+
+#ifndef HAVE_GROUP_AUDIO_H
+#define HAVE_GROUP_AUDIO_H
+
+#include "xine_internal.h"
+
+void *demux_ac3_init_plugin (xine_t *xine, void *data);
+void *demux_aud_init_plugin (xine_t *xine, void *data);
+void *demux_aiff_init_plugin (xine_t *xine, void *data);
+void *demux_cdda_init_plugin (xine_t *xine, void *data);
+void *demux_mpgaudio_init_class (xine_t *xine, void *data);
+void *demux_nsf_init_plugin (xine_t *xine, void *data);
+void *demux_realaudio_init_plugin (xine_t *xine, void *data);
+void *demux_snd_init_plugin (xine_t *xine, void *data);
+void *demux_voc_init_plugin (xine_t *xine, void *data);
+void *demux_vox_init_plugin (xine_t *xine, void *data);
+void *demux_wav_init_plugin (xine_t *xine, void *data);
+
+#endif
diff --git a/src/demuxers/group_games.c b/src/demuxers/group_games.c
index 4f8e7d309..55e207b1f 100644
--- a/src/demuxers/group_games.c
+++ b/src/demuxers/group_games.c
@@ -19,7 +19,7 @@
  *
  * This file contains plugin entries for several demuxers used in games
  *
- * $Id: group_games.c,v 1.5 2003/07/25 21:02:05 miguelfreitas Exp $
+ * $Id: group_games.c,v 1.6 2003/08/25 21:51:39 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -29,17 +29,7 @@
 #include "xine_internal.h"
 #include "demux.h"
 
-
-void *demux_eawve_init_plugin(xine_t *xine, void *data);
-void *demux_idcin_init_plugin (xine_t *xine, void *data);
-void *demux_ipmovie_init_plugin (xine_t *xine, void *data);
-void *demux_vqa_init_plugin (xine_t *xine, void *data);
-void *demux_wc3movie_init_plugin (xine_t *xine, void *data);
-void *demux_roq_init_plugin (xine_t *xine, void *data);
-void *demux_str_init_plugin (xine_t *xine, void *data);
-void *demux_film_init_plugin (xine_t *xine, void *data);
-void *demux_smjpeg_init_plugin (xine_t *xine, void *data);
-void *demux_fourxm_init_plugin (xine_t *xine, void *data);
+#include "group_games.h"
 
 /*
  * exported plugin catalog entries
diff --git a/src/demuxers/group_games.h b/src/demuxers/group_games.h
new file mode 100644
index 000000000..1b8bfb60e
--- /dev/null
+++ b/src/demuxers/group_games.h
@@ -0,0 +1,39 @@
+/* 
+ * Copyright (C) 2000-2002 the xine project
+ * 
+ * This file is part of xine, a free video player.
+ * 
+ * xine is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * xine is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ *
+ * $Id: group_games.h,v 1.1 2003/08/25 21:51:39 f1rmb Exp $
+ */
+
+#ifndef HAVE_GROUP_GAMES_H
+#define HAVE_GROUP_GAMES_H
+
+#include "xine_internal.h"
+
+void *demux_eawve_init_plugin(xine_t *xine, void *data);
+void *demux_idcin_init_plugin (xine_t *xine, void *data);
+void *demux_ipmovie_init_plugin (xine_t *xine, void *data);
+void *demux_vqa_init_plugin (xine_t *xine, void *data);
+void *demux_wc3movie_init_plugin (xine_t *xine, void *data);
+void *demux_roq_init_plugin (xine_t *xine, void *data);
+void *demux_str_init_plugin (xine_t *xine, void *data);
+void *demux_film_init_plugin (xine_t *xine, void *data);
+void *demux_smjpeg_init_plugin (xine_t *xine, void *data);
+void *demux_fourxm_init_plugin (xine_t *xine, void *data);
+
+#endif
diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c
index 59a0fda71..ca091958a 100644
--- a/src/input/input_cdda.c
+++ b/src/input/input_cdda.c
@@ -20,7 +20,7 @@
  * Compact Disc Digital Audio (CDDA) Input Plugin 
  *   by Mike Melanson (melanson@pcisys.net)
  *
- * $Id: input_cdda.c,v 1.31 2003/08/10 16:11:05 miguelfreitas Exp $
+ * $Id: input_cdda.c,v 1.32 2003/08/25 21:51:39 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -355,13 +355,13 @@ static void print_cdrom_toc(cdrom_toc *toc) {
 	}	
 }
 
-void init_cdrom_toc(cdrom_toc *toc) {
+static void init_cdrom_toc(cdrom_toc *toc) {
 
   toc->first_track = toc->last_track = toc->total_tracks = 0;
   toc->toc_entries = NULL;
 }
 
-void free_cdrom_toc(cdrom_toc *toc) {
+static void free_cdrom_toc(cdrom_toc *toc) {
 
   if(toc && toc->toc_entries)
     free(toc->toc_entries);
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index 9fe9805dd..cdb250e2a 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.167 2003/08/21 00:37:26 miguelfreitas Exp $
+ * $Id: input_dvd.c,v 1.168 2003/08/25 21:51:39 f1rmb Exp $
  *
  */
 
@@ -353,7 +353,7 @@ static void send_mouse_enter_leave_event(dvd_input_plugin_t *this, int direction
     this->mouse_buttonN = -1;
 }
  
-void update_title_display(dvd_input_plugin_t *this) {
+static void update_title_display(dvd_input_plugin_t *this) {
   xine_event_t uevent;
   xine_ui_data_t data;
   int tt=-1, pr=-1;
@@ -1611,7 +1611,7 @@ static char **dvd_class_get_autoplay_list (input_class_t *this_gen,
   return this->filelist2;
 }
 
-void dvd_class_dispose(input_class_t *this_gen) {
+static void dvd_class_dispose(input_class_t *this_gen) {
   dvd_input_class_t *this = (dvd_input_class_t*)this_gen;
   
   free(this->mrls); this->mrls = NULL;
@@ -1736,6 +1736,9 @@ static void *init_class (xine_t *xine, void *data) {
 
 /*
  * $Log: input_dvd.c,v $
+ * Revision 1.168  2003/08/25 21:51:39  f1rmb
+ * Reduce GCC verbosity (various prototype declaration fixes). ffmpeg, wine and fft*post are untouched (fft: for now).
+ *
  * Revision 1.167  2003/08/21 00:37:26  miguelfreitas
  * RIP Input Plugin
  *
diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c
index d96c7f485..65de4fe41 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -702,7 +702,7 @@ static int search_by_channel(v4l_input_plugin_t *this, char *input_source)
    return 1;   
 }
 
-int open_radio_capture_device(v4l_input_plugin_t *this)
+static int open_radio_capture_device(v4l_input_plugin_t *this)
 {
    int tuner_found = 0;
    int i = 0;
@@ -776,7 +776,7 @@ int open_radio_capture_device(v4l_input_plugin_t *this)
       return 2;
 }
 
-int close_radio_capture_device(v4l_input_plugin_t *this)
+static int close_radio_capture_device(v4l_input_plugin_t *this)
 {
    if (this->radio_fd > 0)
       close(this->radio_fd);
@@ -796,7 +796,7 @@ int close_radio_capture_device(v4l_input_plugin_t *this)
  * which the signal should be grabbed.
  * @return 1 on success, 0 on failure.
  */
-int open_video_capture_device(v4l_input_plugin_t *this)
+static int open_video_capture_device(v4l_input_plugin_t *this)
 {
    int i, j, ret, found = 0;
    int tuner_found = 0;
@@ -1042,7 +1042,7 @@ int open_video_capture_device(v4l_input_plugin_t *this)
  * This function opens an alsa capture device. This will be used to capture
  * audio data from.
  */
-int open_audio_capture_device(v4l_input_plugin_t *this)
+static int open_audio_capture_device(v4l_input_plugin_t *this)
 {
 #ifdef HAVE_ALSA
    DBGPRINT("Audio    Opening PCM Device\n");
diff --git a/src/input/libdvdnav/decoder.c b/src/input/libdvdnav/decoder.c
index 7268bd79e..44b3b24e2 100644
--- a/src/input/libdvdnav/decoder.c
+++ b/src/input/libdvdnav/decoder.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: decoder.c,v 1.11 2003/05/16 09:56:50 mroi Exp $
+ * $Id: decoder.c,v 1.12 2003/08/25 21:51:40 f1rmb Exp $
  *
  */
 
@@ -125,7 +125,8 @@ static uint16_t eval_reg_or_data(command_t* command, int32_t imm, int32_t start)
    xBBB_BBBB, if immediate use all 7 bits for data else use
    lower four bits for the general purpose register number. */
 /* Evaluates gprm or data depending on bit, data is in byte n */
-uint16_t eval_reg_or_data_2(command_t* command, int32_t imm, int32_t start) {
+static uint16_t eval_reg_or_data_2(command_t* command, 
+				   int32_t imm, int32_t start) {
   if(imm) /* immediate */
     return vm_getbits(command, (start - 1), 7);
   else
diff --git a/src/input/libdvdnav/dvd_reader.c b/src/input/libdvdnav/dvd_reader.c
index 40bed7ea6..09879e29e 100644
--- a/src/input/libdvdnav/dvd_reader.c
+++ b/src/input/libdvdnav/dvd_reader.c
@@ -95,6 +95,10 @@ struct dvd_file_s {
     ssize_t filesize;
 };
 
+int UDFReadBlocksRaw( dvd_reader_t *device, uint32_t lb_number,
+                     size_t block_count, unsigned char *data, 
+                     int encrypted );
+
 /**
  * Set the level of caching on udf
  * level = 0 (no caching)
diff --git a/src/input/libdvdnav/dvd_reader.h b/src/input/libdvdnav/dvd_reader.h
index edd18da77..c7d220f80 100644
--- a/src/input/libdvdnav/dvd_reader.h
+++ b/src/input/libdvdnav/dvd_reader.h
@@ -266,6 +266,12 @@ int DVDISOVolumeInfo( dvd_reader_t *, char *, unsigned int,
  */
 int DVDUDFCacheLevel( dvd_reader_t *, int );
 
+/**
+ * COMMENT ME
+ */
+void *GetUDFCacheHandle(dvd_reader_t *device);
+void SetUDFCacheHandle(dvd_reader_t *device, void *cache);
+
 #ifdef __cplusplus
 };
 #endif
diff --git a/src/input/libdvdnav/dvd_udf.c b/src/input/libdvdnav/dvd_udf.c
index a834cc8ac..d7adac891 100644
--- a/src/input/libdvdnav/dvd_udf.c
+++ b/src/input/libdvdnav/dvd_udf.c
@@ -144,9 +144,6 @@ typedef enum {
   PartitionCache, RootICBCache, LBUDFCache, MapCache, AVDPCache, PVDCache
 } UDFCacheType;
 
-extern void *GetUDFCacheHandle(dvd_reader_t *device);
-extern void SetUDFCacheHandle(dvd_reader_t *device, void *cache);
-
 void FreeUDFCache(void *cache)
 {
   struct udf_cache *c = (struct udf_cache *)cache;
diff --git a/src/input/libdvdnav/remap.c b/src/input/libdvdnav/remap.c
index 3019c514a..8fffc6e29 100644
--- a/src/input/libdvdnav/remap.c
+++ b/src/input/libdvdnav/remap.c
@@ -15,7 +15,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: remap.c,v 1.3 2003/04/29 15:58:30 jcdutton Exp $
+ * $Id: remap.c,v 1.4 2003/08/25 21:51:40 f1rmb Exp $
  */
 
 #include <stdlib.h>
@@ -51,7 +51,7 @@ struct remap_s {
     struct block_s *blocks;
 };
 
-remap_t* remap_new( char *title) {
+static remap_t* remap_new( char *title) {
     remap_t *map = malloc( sizeof(remap_t));
     map->title = strdup(title);
     map->maxblocks = 0;
@@ -142,10 +142,8 @@ static void remap_add_node( remap_t *map, block_t block) {
     }
 }
 
-int parseblock( 
-	char *buf, int *dom, int *tt, int *pg, 
-	unsigned long *start, unsigned long *end) 
-{
+static int parseblock(char *buf, int *dom, int *tt, int *pg, 
+		      unsigned long *start, unsigned long *end) {
     long tmp;
     char *tok;
     char *epos;
diff --git a/src/input/media_helper.c b/src/input/media_helper.c
index 5d387bb44..9c209f333 100644
--- a/src/input/media_helper.c
+++ b/src/input/media_helper.c
@@ -47,6 +47,7 @@
 #warning "This might not compile due to missing cdrom ioctls"
 #endif
 
+#include "media_helper.h"
 
 #define LOG_MEDIA_EJECT
 
@@ -92,7 +93,7 @@ int media_eject_media (char *device) {
   /* printf("input_dvd: Eject Device %s current device %s opened=%d handle=%p trying...\n",device, this->current_dvd_device, this->opened, this->dvdnav); */
   media_umount_media(device);
   /**********
-        printf("ipnut_dvd: umount result: %s\n", 
+        printf("input_dvd: umount result: %s\n", 
                   strerror(errno));  
    ***********/
 
diff --git a/src/input/mms.c b/src/input/mms.c
index 3b2b0b7f6..fd468fc01 100644
--- a/src/input/mms.c
+++ b/src/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: mms.c,v 1.29 2003/07/10 22:43:41 tmattern Exp $
+ * $Id: mms.c,v 1.30 2003/08/25 21:51:39 f1rmb Exp $
  *
  * MMS over TCP protocol
  *   based on work from major mms
@@ -660,7 +660,7 @@ static void report_progress (xine_stream_t *stream, int p) {
  * TODO: error messages
  * returns 1 on error
  */
-int mms_parse_url(mms_t *this) {
+static int mms_parse_url(mms_t *this) {
   int     proto_len;
   char   *hostend;
   char   *forport;
@@ -712,7 +712,7 @@ int mms_parse_url(mms_t *this) {
 /*
  * returns 1 on error
  */
-int mms_tcp_connect(mms_t *this) {
+static int mms_tcp_connect(mms_t *this) {
   int progress, res;
   /* 
    * try to connect 
@@ -745,7 +745,7 @@ int mms_tcp_connect(mms_t *this) {
   return 0;
 }
 
-void mms_gen_guid(char guid[]) {
+static void mms_gen_guid(char guid[]) {
   static char digit[16] = "0123456789ABCDEF";
   int i = 0;
 
diff --git a/src/input/net_buf_ctrl.c b/src/input/net_buf_ctrl.c
index 2de2764bf..0138f1234 100644
--- a/src/input/net_buf_ctrl.c
+++ b/src/input/net_buf_ctrl.c
@@ -225,7 +225,8 @@ static void nbc_compute_fifo_length(nbc_t *this,
 
 /* Put callback
  * the fifo mutex is locked */
-void nbc_put_cb (fifo_buffer_t *fifo, buf_element_t *buf, void *this_gen) {
+static void nbc_put_cb (fifo_buffer_t *fifo, 
+			buf_element_t *buf, void *this_gen) {
   nbc_t *this = (nbc_t*)this_gen;
   int64_t progress = 0;
   int64_t video_p = 0;
@@ -335,7 +336,8 @@ void nbc_put_cb (fifo_buffer_t *fifo, buf_element_t *buf, void *this_gen) {
 
 /* Get callback
  * the fifo mutex is locked */
-void nbc_get_cb (fifo_buffer_t *fifo, buf_element_t *buf, void *this_gen) {
+static void nbc_get_cb (fifo_buffer_t *fifo,
+			buf_element_t *buf, void *this_gen) {
   nbc_t *this = (nbc_t*)this_gen;
   int other_fifo_free;
   pthread_mutex_lock(&this->mutex);
diff --git a/src/liba52/xine_decoder.c b/src/liba52/xine_decoder.c
index 8a9a35e9c..4815b4dfe 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.53 2003/05/23 15:10:27 jcdutton Exp $
+ * $Id: xine_decoder.c,v 1.54 2003/08/25 21:51:40 f1rmb Exp $
  *
  * stuff needed to turn liba52 into a xine decoder plugin
  */
@@ -140,7 +140,7 @@ static const struct frmsize_s frmsizecod_tbl[64] =
   { 640 ,{1280 ,1394 ,1920 } }
 };
 
-void a52dec_reset (audio_decoder_t *this_gen) {
+static void a52dec_reset (audio_decoder_t *this_gen) {
 
   a52dec_decoder_t *this = (a52dec_decoder_t *) this_gen;
 
@@ -149,7 +149,7 @@ void a52dec_reset (audio_decoder_t *this_gen) {
   this->pts           = 0;
 }
 
-void a52dec_discontinuity (audio_decoder_t *this_gen) {
+static void a52dec_discontinuity (audio_decoder_t *this_gen) {
 
   a52dec_decoder_t *this = (a52dec_decoder_t *) this_gen;
 
@@ -351,7 +351,7 @@ static void a52dec_decode_frame (a52dec_decoder_t *this, int64_t pts, int previe
   }
 }
 
-void a52dec_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
+static void a52dec_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
 
   a52dec_decoder_t *this = (a52dec_decoder_t *) this_gen;
   uint8_t          *current = buf->content;
diff --git a/src/libfaad/common.c b/src/libfaad/common.c
index c68f438ff..028886ba5 100644
--- a/src/libfaad/common.c
+++ b/src/libfaad/common.c
@@ -16,7 +16,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: common.c,v 1.2 2002/12/16 18:59:56 miguelfreitas Exp $
+** $Id: common.c,v 1.3 2003/08/25 21:51:40 f1rmb Exp $
 **/
 
 /* just some common functions that could be used anywhere */
@@ -25,6 +25,7 @@
 #include "structs.h"
 
 #include "syntax.h"
+#include "dither.h"
 
 /* Returns the sample rate index based on the samplerate */
 uint8_t get_sr_index(uint32_t samplerate)
diff --git a/src/libfaad/decoder.c b/src/libfaad/decoder.c
index 64d8259f8..dbe691f77 100644
--- a/src/libfaad/decoder.c
+++ b/src/libfaad/decoder.c
@@ -16,7 +16,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: decoder.c,v 1.4 2003/04/12 14:58:47 miguelfreitas Exp $
+** $Id: decoder.c,v 1.5 2003/08/25 21:51:41 f1rmb Exp $
 **/
 
 #include "common.h"
@@ -54,7 +54,7 @@ int8_t* FAADAPI faacDecGetErrorMessage(uint8_t errcode)
     return err_msg[errcode];
 }
 
-uint32_t FAADAPI faacDecGetCapabilities()
+uint32_t FAADAPI faacDecGetCapabilities(void)
 {
     uint32_t cap = 0;
 
@@ -80,7 +80,7 @@ uint32_t FAADAPI faacDecGetCapabilities()
     return cap;
 }
 
-faacDecHandle FAADAPI faacDecOpen()
+faacDecHandle FAADAPI faacDecOpen(void)
 {
     uint8_t i;
     faacDecHandle hDecoder = NULL;
diff --git a/src/libfaad/decoder.h b/src/libfaad/decoder.h
index 0b4a5e0c6..0257049ce 100644
--- a/src/libfaad/decoder.h
+++ b/src/libfaad/decoder.h
@@ -16,7 +16,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: decoder.h,v 1.3 2003/04/12 14:58:47 miguelfreitas Exp $
+** $Id: decoder.h,v 1.4 2003/08/25 21:51:41 f1rmb Exp $
 **/
 
 #ifndef __DECODER_H__
@@ -67,9 +67,9 @@ extern "C" {
 
 int8_t* FAADAPI faacDecGetErrorMessage(uint8_t errcode);
 
-uint32_t FAADAPI faacDecGetCapabilities();
+uint32_t FAADAPI faacDecGetCapabilities(void);
 
-faacDecHandle FAADAPI faacDecOpen();
+faacDecHandle FAADAPI faacDecOpen(void);
 
 faacDecConfigurationPtr FAADAPI faacDecGetCurrentConfiguration(faacDecHandle hDecoder);
 
diff --git a/src/libfaad/faad.h b/src/libfaad/faad.h
index 3c904ce09..11c69777c 100644
--- a/src/libfaad/faad.h
+++ b/src/libfaad/faad.h
@@ -16,7 +16,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: faad.h,v 1.3 2003/04/12 14:58:47 miguelfreitas Exp $
+** $Id: faad.h,v 1.4 2003/08/25 21:51:41 f1rmb Exp $
 **/
 
 #ifndef __AACDEC_H__
@@ -118,9 +118,9 @@ typedef struct faacDecFrameInfo
 
 char* FAADAPI faacDecGetErrorMessage(unsigned char errcode);
 
-unsigned long FAADAPI faacDecGetCapabilities();
+unsigned long FAADAPI faacDecGetCapabilities(void);
 
-faacDecHandle FAADAPI faacDecOpen();
+faacDecHandle FAADAPI faacDecOpen(void);
 
 faacDecConfigurationPtr FAADAPI faacDecGetCurrentConfiguration(faacDecHandle hDecoder);
 
diff --git a/src/libfaad/mdct.c b/src/libfaad/mdct.c
index 7deb017cf..7c01516be 100644
--- a/src/libfaad/mdct.c
+++ b/src/libfaad/mdct.c
@@ -16,7 +16,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: mdct.c,v 1.5 2003/04/12 14:58:47 miguelfreitas Exp $
+** $Id: mdct.c,v 1.6 2003/08/25 21:51:41 f1rmb Exp $
 **/
 
 /*
@@ -89,7 +89,7 @@ real_t const_tab[][5] =
 };
 #endif
 
-uint8_t map_N_to_idx(uint16_t N)
+static uint8_t map_N_to_idx(uint16_t N)
 {
     switch(N)
     {
diff --git a/src/libflac/Makefile.am b/src/libflac/Makefile.am
index 8358402a3..c56e4f327 100644
--- a/src/libflac/Makefile.am
+++ b/src/libflac/Makefile.am
@@ -13,3 +13,5 @@ lib_LTLIBRARIES = $(flac_module)
 xineplug_flac_la_SOURCES = demux_flac.c decoder_flac.c
 xineplug_flac_la_LIBADD = $(LIBFLAC_LIBS)
 xineplug_flac_la_LDFLAGS = -avoid-version -module -lFLAC @XINE_PLUGIN_MIN_SYMS@
+
+noinst_HEADERS = demux_flac.h
\ No newline at end of file
diff --git a/src/libflac/decoder_flac.c b/src/libflac/decoder_flac.c
index 14ef172da..25b800abd 100644
--- a/src/libflac/decoder_flac.c
+++ b/src/libflac/decoder_flac.c
@@ -39,6 +39,8 @@
 #define LOG 1
 */
 
+#include "demux_flac.h"
+
 typedef struct {
   audio_decoder_class_t   decoder_class;
 } flac_class_t;
@@ -420,9 +422,6 @@ static decoder_info_t dec_info_audio = {
   5                    /* priority        */
 };
 
-/* from demux_flac.c */
-void *demux_flac_init_class (xine_t *xine, void *data);
-
 plugin_info_t xine_plugin_info[] = {
   /* type, API, "name", version, special_info, init_function */  
   { PLUGIN_DEMUX, 22, "flac", XINE_VERSION_CODE, NULL, demux_flac_init_class },
diff --git a/src/libflac/demux_flac.c b/src/libflac/demux_flac.c
index 6c83715d9..652916fd8 100644
--- a/src/libflac/demux_flac.c
+++ b/src/libflac/demux_flac.c
@@ -46,6 +46,8 @@
 #define LOG 1
 */
 
+#include "demux_flac.h"
+
 /* FLAC Demuxer plugin */
 typedef struct demux_flac_s {
   demux_plugin_t        demux_plugin;
@@ -660,14 +662,3 @@ demux_flac_init_class (xine_t *xine, void *data) {
 
     return this;
 }
-
-/*
- * exported plugin catalog entry
- */
-#if 0
-plugin_info_t xine_plugin_info[] = {
-  /* type, API, "name", version, special_info, init_function */  
-  { PLUGIN_DEMUX, 22, "flac", XINE_VERSION_CODE, NULL, demux_flac_init_class },
-  { PLUGIN_NONE, 0, "", 0, NULL, NULL }
-};
-#endif
diff --git a/src/libflac/demux_flac.h b/src/libflac/demux_flac.h
new file mode 100644
index 000000000..a35362812
--- /dev/null
+++ b/src/libflac/demux_flac.h
@@ -0,0 +1,28 @@
+/* 
+ * Copyright (C) 2000-2002 the xine project
+ * 
+ * This file is part of xine, a free video player.
+ * 
+ * xine is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * xine is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * 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_flac.h,v 1.1 2003/08/25 21:51:42 f1rmb Exp $
+ */
+
+#ifndef HAVE_DEMUX_FLAC_H
+#define HAVE_DEMUX_FLAC_H
+
+void *demux_flac_init_class (xine_t *xine, void *data);
+
+#endif
diff --git a/src/liblpcm/xine_decoder.c b/src/liblpcm/xine_decoder.c
index c71d40ab4..e562933ca 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.42 2003/05/19 10:06:36 tchamp Exp $
+ * $Id: xine_decoder.c,v 1.43 2003/08/25 21:51:42 f1rmb Exp $
  * 
  * 31-8-2001 Added LPCM rate sensing.
  *   (c) 2001 James Courtier-Dutton James@superbug.demon.co.uk
@@ -62,16 +62,16 @@ typedef struct lpcm_decoder_s {
   int		   cpu_be;	/* TRUE, if we're a Big endian CPU */
 } lpcm_decoder_t;
 
-void lpcm_reset (audio_decoder_t *this_gen) {
+static void lpcm_reset (audio_decoder_t *this_gen) {
 
   /* lpcm_decoder_t *this = (lpcm_decoder_t *) this_gen; */
 
 }
 
-void lpcm_discontinuity (audio_decoder_t *this_gen) {
+static void lpcm_discontinuity (audio_decoder_t *this_gen) {
 }
 
-void lpcm_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
+static void lpcm_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
 
   lpcm_decoder_t *this = (lpcm_decoder_t *) this_gen;
   int16_t        *sample_buffer=(int16_t *)buf->content;
diff --git a/src/libreal/audio_decoder.c b/src/libreal/audio_decoder.c
index 418a44337..8f69ff859 100644
--- a/src/libreal/audio_decoder.c
+++ b/src/libreal/audio_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: audio_decoder.c,v 1.25 2003/07/18 23:50:25 jstembridge Exp $
+ * $Id: audio_decoder.c,v 1.26 2003/08/25 21:51:42 f1rmb Exp $
  *
  * thin layer to use real binary-only codecs in xine
  *
@@ -100,6 +100,12 @@ typedef struct {
     void  *extras;
 } ra_init_t;
 
+void *__builtin_new(unsigned long size);
+void __builtin_delete (void *foo);
+void *__builtin_vec_new(unsigned long size);
+void __builtin_vec_delete(void *mem);
+void __pure_virtual(void);
+
 
 void *__builtin_new(unsigned long size) {
   return malloc(size);
diff --git a/src/libreal/xine_decoder.c b/src/libreal/xine_decoder.c
index 403a97bd4..17f762620 100644
--- a/src/libreal/xine_decoder.c
+++ b/src/libreal/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.48 2003/08/04 03:47:09 miguelfreitas Exp $
+ * $Id: xine_decoder.c,v 1.49 2003/08/25 21:51:43 f1rmb Exp $
  *
  * thin layer to use real binary-only codecs in xine
  *
@@ -108,6 +108,10 @@ typedef struct {
 } rv_init_t;
 
 
+void *__builtin_vec_new(unsigned long size);
+void __builtin_vec_delete(void *mem);
+void __pure_virtual(void);
+
 /*
  * real codec loader
  */
diff --git a/src/libspucc/xine_decoder.c b/src/libspucc/xine_decoder.c
index 321b9652b..238ffaf8b 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.25 2003/05/03 14:24:08 mroi Exp $
+ * $Id: xine_decoder.c,v 1.26 2003/08/25 21:51:43 f1rmb Exp $
  *
  * closed caption spu decoder. receive data by events. 
  *
@@ -267,8 +267,8 @@ static void spucc_unregister_cfg_callbacks(config_values_t *xine_cfg) {
 
 
 /* called when the video frame size changes */
-void spucc_notify_frame_change(spucc_decoder_t *this, int width, int height)
-{
+static void spucc_notify_frame_change(spucc_decoder_t *this, 
+				      int width, int height) {
 #ifdef LOG_DEBUG
   printf("spucc: new frame size: %dx%d\n", width, height);
 #endif
diff --git a/src/libxineadec/nosefart/nes_apu.c b/src/libxineadec/nosefart/nes_apu.c
index f4984aa3c..162bcebbd 100644
--- a/src/libxineadec/nosefart/nes_apu.c
+++ b/src/libxineadec/nosefart/nes_apu.c
@@ -20,7 +20,7 @@
 ** nes_apu.c
 **
 ** NES APU emulation
-** $Id: nes_apu.c,v 1.1 2003/01/08 07:04:35 tmmm Exp $
+** $Id: nes_apu.c,v 1.2 2003/08/25 21:51:43 f1rmb Exp $
 */
 
 #include <string.h>
@@ -103,7 +103,7 @@ const int dmc_clocks[16] =
 static const int duty_lut[4] = { 2, 4, 8, 12 };
 
 
-void apu_setcontext(apu_t *src_apu)
+static void apu_setcontext(apu_t *src_apu)
 {
    apu = src_apu;
 }
@@ -1054,7 +1054,7 @@ void apu_reset(void)
       apu->ext->reset();
 }
 
-void apu_build_luts(int num_samples)
+static void apu_build_luts(int num_samples)
 {
    int i;
 
@@ -1154,6 +1154,9 @@ int32 apu_getcyclerate(void)
 
 /*
 ** $Log: nes_apu.c,v $
+** Revision 1.2  2003/08/25 21:51:43  f1rmb
+** Reduce GCC verbosity (various prototype declaration fixes). ffmpeg, wine and fft*post are untouched (fft: for now).
+**
 ** Revision 1.1  2003/01/08 07:04:35  tmmm
 ** initial import of Nosefart sources
 **
@@ -1196,4 +1199,4 @@ int32 apu_getcyclerate(void)
 ** Revision 1.7  2000/06/09 15:12:28  matt
 ** initial revision
 **
-*/
\ No newline at end of file
+*/
diff --git a/src/libxineadec/nosefart/nsf.c b/src/libxineadec/nosefart/nsf.c
index 1cb476138..477106c66 100644
--- a/src/libxineadec/nosefart/nsf.c
+++ b/src/libxineadec/nosefart/nsf.c
@@ -20,7 +20,7 @@
 ** nsf.c
 **
 ** NSF loading/saving related functions
-** $Id: nsf.c,v 1.2 2003/01/09 18:36:40 jkeil Exp $
+** $Id: nsf.c,v 1.3 2003/08/25 21:51:43 f1rmb Exp $
 */
 
 #include <stdio.h>
@@ -297,7 +297,7 @@ void nsf_frame(nsf_t *nsf)
 }
 
 /* Deallocate memory */
-void nes_shutdown(nsf_t *nsf)
+static void nes_shutdown(nsf_t *nsf)
 {
    int i;
 
@@ -579,6 +579,9 @@ void nsf_setfilter(nsf_t *nsf, int filter_type)
 
 /*
 ** $Log: nsf.c,v $
+** Revision 1.3  2003/08/25 21:51:43  f1rmb
+** Reduce GCC verbosity (various prototype declaration fixes). ffmpeg, wine and fft*post are untouched (fft: for now).
+**
 ** Revision 1.2  2003/01/09 18:36:40  jkeil
 ** memcpy copies too much, corrupts malloc heap
 **
diff --git a/src/libxinevdec/cyuv.c b/src/libxinevdec/cyuv.c
index 570a94787..58d7e635c 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.17 2003/08/04 03:47:10 miguelfreitas Exp $
+ * $Id: cyuv.c,v 1.18 2003/08/25 21:51:43 f1rmb Exp $
  */
 
 /* And this is the header that came with the CYUV decoder: */
@@ -87,7 +87,7 @@ typedef struct cyuv_decoder_s {
  * height - the height of the output frame
  * bit_per_pixel - ignored for now: may be used later for conversions.
  */
-void cyuv_decode(unsigned char *buf, int size, unsigned char *frame,
+static void cyuv_decode(unsigned char *buf, int size, unsigned char *frame,
   int width, int height, int bit_per_pixel) {
 
   int i, xpos, ypos, cur_Y = 0, cur_U = 0, cur_V = 0;
diff --git a/src/libxinevdec/fli.c b/src/libxinevdec/fli.c
index 5684aa93f..0e3a02921 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.19 2003/08/04 03:47:10 miguelfreitas Exp $
+ * $Id: fli.c,v 1.20 2003/08/25 21:51:43 f1rmb Exp $
  */
 
 #include <stdio.h>
@@ -86,7 +86,7 @@ typedef struct fli_decoder_s {
   
 } fli_decoder_t;
 
-void decode_fli_frame(fli_decoder_t *this) {
+static void decode_fli_frame(fli_decoder_t *this) {
   int stream_ptr = 0;
   int stream_ptr_after_color_chunk;
   int pixel_ptr;
diff --git a/src/libxinevdec/idcinvideo.c b/src/libxinevdec/idcinvideo.c
index 97dd8cb93..70d7ea818 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.13 2003/08/04 03:47:10 miguelfreitas Exp $
+ * $Id: idcinvideo.c,v 1.14 2003/08/25 21:51:43 f1rmb Exp $
  */
 
 #include <stdio.h>
@@ -92,7 +92,7 @@ static int num_huff_nodes[256];
 /*
  *  Decodes input Huffman data using the Huffman table.
  */
-void huff_decode(idcinvideo_decoder_t *this) {
+static void huff_decode(idcinvideo_decoder_t *this) {
   hnode_t *hnodes;
   long i;
   int prev;
@@ -135,7 +135,7 @@ void huff_decode(idcinvideo_decoder_t *this) {
  *  Returns the node index of the lowest unused node, or -1 if all nodes
  *  are used.
  */
-int huff_smallest_node(hnode_t *hnodes, int num_hnodes) {
+static int huff_smallest_node(hnode_t *hnodes, int num_hnodes) {
   int i;
   int best, best_node;
 
@@ -167,7 +167,7 @@ int huff_smallest_node(hnode_t *hnodes, int num_hnodes) {
  *   num_huff_nodes[prev] - contains the index to the root node of the tree.
  *     That is: huff_nodes[prev][num_huff_nodes[prev]] is the root node.
  */
-void huff_build_tree(int prev) {
+static void huff_build_tree(int prev) {
   hnode_t *node, *hnodes;
   int num_hnodes, i;
 
diff --git a/src/libxinevdec/image.c b/src/libxinevdec/image.c
index c67d09fa4..990219a52 100644
--- a/src/libxinevdec/image.c
+++ b/src/libxinevdec/image.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: image.c,v 1.5 2003/08/04 03:47:10 miguelfreitas Exp $
+ * $Id: image.c,v 1.6 2003/08/25 21:51:43 f1rmb Exp $
  *
  * a image video decoder
  */
@@ -81,12 +81,12 @@ typedef struct image_decoder_s {
  * png stuff
  */
 
-void info_callback(png_structp png_ptr, png_infop info);
-void row_callback(png_structp png_ptr, png_bytep new_row,
-    png_uint_32 row_num, int pass);
-void end_callback(png_structp png_ptr, png_infop info);
+static void info_callback(png_structp png_ptr, png_infop info);
+static void row_callback(png_structp png_ptr, png_bytep new_row,
+			 png_uint_32 row_num, int pass);
+static void end_callback(png_structp png_ptr, png_infop info);
 
-int initialize_png_reader(image_decoder_t *this) {
+static int initialize_png_reader(image_decoder_t *this) {
  
   this->png_ptr = png_create_read_struct
       (PNG_LIBPNG_VER_STRING, (png_voidp)this,
@@ -113,7 +113,7 @@ int initialize_png_reader(image_decoder_t *this) {
   return 0;
 }
 
-int finalize_png_reader(image_decoder_t *this) {
+static void finalize_png_reader(image_decoder_t *this) {
 
   png_destroy_read_struct(&this->png_ptr, &this->info_ptr,
 	 (png_infopp)NULL);
@@ -122,7 +122,8 @@ int finalize_png_reader(image_decoder_t *this) {
 
 }
 
-int process_data(image_decoder_t *this, png_bytep buffer, png_uint_32 length) {
+static int process_data(image_decoder_t *this, 
+			png_bytep buffer, png_uint_32 length) {
    
   if (setjmp(this->jmpbuf)) {
     png_destroy_read_struct(&this->png_ptr, &this->info_ptr, (png_infopp)NULL);
@@ -136,7 +137,7 @@ int process_data(image_decoder_t *this, png_bytep buffer, png_uint_32 length) {
   * process png header (do some conversions if necessary)
   */
 
-void info_callback(png_structp png_ptr, png_infop info_ptr) {
+static void info_callback(png_structp png_ptr, png_infop info_ptr) {
   int i;
   image_decoder_t *this = png_get_progressive_ptr(png_ptr);
 
@@ -187,7 +188,7 @@ void info_callback(png_structp png_ptr, png_infop info_ptr) {
   this->rows_valid = 1;
 }
 
-void row_callback(png_structp png_ptr, png_bytep new_row,
+static void row_callback(png_structp png_ptr, png_bytep new_row,
   png_uint_32 row_num, int pass) {
 
   image_decoder_t *this = png_get_progressive_ptr(png_ptr);
@@ -208,7 +209,7 @@ void row_callback(png_structp png_ptr, png_bytep new_row,
 #define	ONE_HALF	( (int32_t) (1<< (SCALEBITS-1)) )
 #define	CBCR_OFFSET	(CENTERSAMPLE << SCALEBITS)
 
-void end_callback(png_structp png_ptr, png_infop info) {
+static void end_callback(png_structp png_ptr, png_infop info) {
 
   vo_frame_t *img; /* video out frame */
   int row, col;
diff --git a/src/libxinevdec/interplayvideo.c b/src/libxinevdec/interplayvideo.c
index df770c10a..b47c338da 100644
--- a/src/libxinevdec/interplayvideo.c
+++ b/src/libxinevdec/interplayvideo.c
@@ -21,7 +21,7 @@
  * For more information regarding the Interplay MVE format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: interplayvideo.c,v 1.3 2003/08/04 03:47:10 miguelfreitas Exp $
+ * $Id: interplayvideo.c,v 1.4 2003/08/25 21:51:43 f1rmb Exp $
  */
 
 #include <stdio.h>
@@ -131,7 +131,7 @@ typedef struct interplay_decoder_s {
     pixel_ptr += this->width; \
   }
 
-void interplay_decode_frame(interplay_decoder_t *this) {
+static void interplay_decode_frame(interplay_decoder_t *this) {
 
   int pixel_ptr, motion_pixel_ptr;
   int x, y;
diff --git a/src/libxinevdec/msrle.c b/src/libxinevdec/msrle.c
index aae46dba8..c185d33e0 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.17 2003/08/04 03:47:10 miguelfreitas Exp $
+ * $Id: msrle.c,v 1.18 2003/08/25 21:51:43 f1rmb Exp $
  */
 
 #include <stdio.h>
@@ -78,7 +78,7 @@ typedef struct msrle_decoder_s {
     } \
     stream_byte = this->buf[stream_ptr++];
 
-void decode_msrle8(msrle_decoder_t *this) {
+static void decode_msrle8(msrle_decoder_t *this) {
 
   int stream_ptr = 0;
   unsigned char rle_code;
diff --git a/src/libxinevdec/qtrpza.c b/src/libxinevdec/qtrpza.c
index 429b04dd5..568a30864 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.15 2003/08/04 03:47:10 miguelfreitas Exp $
+ * $Id: qtrpza.c,v 1.16 2003/08/25 21:51:43 f1rmb Exp $
  */
 
 #include <stdio.h>
@@ -102,7 +102,7 @@ typedef struct qtrpza_decoder_s {
   v_val = COMPUTE_V(r, g, b); \
 }
 
-void decode_qtrpza(qtrpza_decoder_t *this) {
+static void decode_qtrpza(qtrpza_decoder_t *this) {
 
   int i;
   int stream_ptr = 0;
diff --git a/src/libxinevdec/qtsmc.c b/src/libxinevdec/qtsmc.c
index f658bf2a9..dcc17ac71 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.15 2003/08/04 03:47:10 miguelfreitas Exp $
+ * $Id: qtsmc.c,v 1.16 2003/08/25 21:51:43 f1rmb Exp $
  */
 
 #include <stdio.h>
@@ -102,7 +102,7 @@ typedef struct qtsmc_decoder_s {
   } \
 }
 
-void decode_qtsmc(qtsmc_decoder_t *this) {
+static void decode_qtsmc(qtsmc_decoder_t *this) {
 
   int i;
   int stream_ptr = 0;
diff --git a/src/post/deinterlace/plugins/double.c b/src/post/deinterlace/plugins/double.c
index 44ab0d492..6566df293 100644
--- a/src/post/deinterlace/plugins/double.c
+++ b/src/post/deinterlace/plugins/double.c
@@ -26,6 +26,7 @@
 #endif
 #include "speedy.h"
 #include "deinterlace.h"
+#include "plugins.h"
 
 static void deinterlace_scanline_double( uint8_t *output,
                                          deinterlace_scanline_data_t *data,
diff --git a/src/post/deinterlace/plugins/greedy.c b/src/post/deinterlace/plugins/greedy.c
index 1384bd0cd..e12c0c1e0 100644
--- a/src/post/deinterlace/plugins/greedy.c
+++ b/src/post/deinterlace/plugins/greedy.c
@@ -35,6 +35,7 @@
 #include "deinterlace.h"
 #include "speedtools.h"
 #include "speedy.h"
+#include "plugins.h"
 
 // This is a simple lightweight DeInterlace method that uses little CPU time
 // but gives very good results for low or intermedite motion.
diff --git a/src/post/deinterlace/plugins/greedy2frame.c b/src/post/deinterlace/plugins/greedy2frame.c
index 0b2f1e40f..065bd2ac8 100644
--- a/src/post/deinterlace/plugins/greedy2frame.c
+++ b/src/post/deinterlace/plugins/greedy2frame.c
@@ -35,7 +35,7 @@
 #include "deinterlace.h"
 #include "speedtools.h"
 #include "speedy.h"
-
+#include "plugins.h"
 
 // debugging feature
 // output the value of mm4 at this point which is pink where we will weave
diff --git a/src/post/deinterlace/plugins/linear.c b/src/post/deinterlace/plugins/linear.c
index 97f286f86..8d2e23f29 100644
--- a/src/post/deinterlace/plugins/linear.c
+++ b/src/post/deinterlace/plugins/linear.c
@@ -24,6 +24,7 @@
 #endif
 #include "speedy.h"
 #include "deinterlace.h"
+#include "plugins.h"
 
 static void deinterlace_scanline_linear( uint8_t *output,
                                          deinterlace_scanline_data_t *data,
diff --git a/src/post/deinterlace/plugins/linearblend.c b/src/post/deinterlace/plugins/linearblend.c
index 06e6d105a..8caaac5e7 100644
--- a/src/post/deinterlace/plugins/linearblend.c
+++ b/src/post/deinterlace/plugins/linearblend.c
@@ -37,6 +37,7 @@
 #include "speedtools.h"
 #include "speedy.h"
 #include "deinterlace.h"
+#include "plugins.h"
 
 static void deinterlace_scanline_linear_blend( uint8_t *output,
                                                deinterlace_scanline_data_t *data,
diff --git a/src/post/deinterlace/plugins/vfir.c b/src/post/deinterlace/plugins/vfir.c
index c57960f05..ddf2ae4c8 100644
--- a/src/post/deinterlace/plugins/vfir.c
+++ b/src/post/deinterlace/plugins/vfir.c
@@ -36,6 +36,7 @@
 #include "xineutils.h"
 #include "speedy.h"
 #include "deinterlace.h"
+#include "plugins.h"
 
 /**
  * The MPEG2 spec uses a slightly harsher filter, they specify
diff --git a/src/post/deinterlace/plugins/weave.c b/src/post/deinterlace/plugins/weave.c
index 287357526..7107a07a6 100644
--- a/src/post/deinterlace/plugins/weave.c
+++ b/src/post/deinterlace/plugins/weave.c
@@ -26,6 +26,7 @@
 #endif
 #include "speedy.h"
 #include "deinterlace.h"
+#include "plugins.h"
 
 static void deinterlace_scanline_weave( uint8_t *output,
                                         deinterlace_scanline_data_t *data,
diff --git a/src/post/goom/Makefile.am b/src/post/goom/Makefile.am
index 76aee8ca8..1d35308b5 100644
--- a/src/post/goom/Makefile.am
+++ b/src/post/goom/Makefile.am
@@ -29,3 +29,5 @@ xineplug_post_goom_la_SOURCES = xine_goom.c \
 
 xineplug_post_goom_la_LIBADD = $(XINE_LIB)
 xineplug_post_goom_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
+
+noinst_HEADERS = zoom_filter_mmx.h
diff --git a/src/post/goom/filters.c b/src/post/goom/filters.c
index e2aad6466..4628bc0aa 100644
--- a/src/post/goom/filters.c
+++ b/src/post/goom/filters.c
@@ -36,10 +36,7 @@ extern volatile int     use_asm;
 
 #ifdef MMX
 /*int mmx_zoom () ;*/
-void    zoom_filter_mmx (int prevX, int prevY,
-												 unsigned int *expix1, unsigned int *expix2,
-												 int *brutS, int *brutD, int buffratio,
-												 int precalCoef[16][16]);
+#include "zoom_filter_mmx.h"
 #endif /* MMX */
 
 
@@ -106,7 +103,7 @@ static int *firedec = 0;
 
 
 /* retourne x>>s , en testant le signe de x */
-int ShiftRight (int x, const unsigned char s)
+static int ShiftRight (int x, const unsigned char s)
 {
 	if (x < 0)
 		return -(-x >> s);
@@ -118,7 +115,7 @@ int ShiftRight (int x, const unsigned char s)
 /** modif d'optim by Jeko : precalcul des 4 coefs résultant des 2 pos */
 int     precalCoef[16][16];
 
-void generatePrecalCoef ()
+static void generatePrecalCoef (void)
 {
 	static int firstime = 1;
 
@@ -173,7 +170,7 @@ void generatePrecalCoef ()
  px et py indique la nouvelle position (en sqrtperte ieme de pixel)
  (valeur * 16)
  */
-void calculatePXandPY (int x, int y, int *px, int *py)
+static void calculatePXandPY (int x, int y, int *px, int *py)
 {
 	if (theMode == WATER_MODE) {
 		static int wave = 0;
@@ -311,7 +308,7 @@ void setPixelRGB (Uint * buffer, Uint x, Uint y, Color c)
 }
 
 
-void setPixelRGB_ (Uint * buffer, Uint x, Color c)
+static void setPixelRGB_ (Uint * buffer, Uint x, Color c)
 {
 #ifdef _DEBUG
 	if (x >= resolx * c_resoly) {
@@ -363,7 +360,7 @@ void getPixelRGB (Uint * buffer, Uint x, Uint y, Color * c)
 }
 
 
-void getPixelRGB_ (Uint * buffer, Uint x, Color * c)
+static void getPixelRGB_ (Uint * buffer, Uint x, Color * c)
 {
 	register unsigned char *tmp8;
 
@@ -390,8 +387,7 @@ void getPixelRGB_ (Uint * buffer, Uint x, Color * c)
 }
 
 
-void
-c_zoom ()
+static void c_zoom (void)
 {
 	int     myPos, myPos2;
 	Color   couleur;
diff --git a/src/post/goom/goom_core.c b/src/post/goom/goom_core.c
index 3c467b875..fb9dbac9a 100644
--- a/src/post/goom/goom_core.c
+++ b/src/post/goom/goom_core.c
@@ -761,7 +761,7 @@ goom_update (gint16 data[2][512],
 }
 
 void
-goom_close ()
+goom_close (void)
 {
 	if (pixel != NULL)
 		free (pixel);
@@ -955,7 +955,7 @@ void goom_setAsmUse (int useIt)
 	use_asm = useIt;
 }
 
-int goom_getAsmUse ()
+int goom_getAsmUse (void)
 {
 	return use_asm;
 }
diff --git a/src/post/goom/goom_core.h b/src/post/goom/goom_core.h
index 5c5efd286..343285891 100644
--- a/src/post/goom/goom_core.h
+++ b/src/post/goom/goom_core.h
@@ -33,11 +33,11 @@ void    goom_set_resolution (guint32 resx, guint32 resy, int cinemascope);
 guint32 *goom_update (gint16 data[2][512], int forceMode, float fps,
 											char *songTitle, char *message);
 
-void    goom_close ();
+void    goom_close (void);
 
 void    goom_set_font (int ***chars, int *width, int *height);
 
 void goom_setAsmUse (int useIt);
 
-int goom_getAsmUse ();
+int goom_getAsmUse (void);
 #endif
diff --git a/src/post/goom/ifs.c b/src/post/goom/ifs.c
index 40037b6b7..fa1c2c190 100644
--- a/src/post/goom/ifs.c
+++ b/src/post/goom/ifs.c
@@ -538,7 +538,7 @@ draw_ifs ( /* ModeInfo * mi */ int *nbpt)
 /***************************************************************/
 
 void
-release_ifs ()
+release_ifs (void)
 {
 	if (Root != NULL) {
 		(void) free ((void *) Root);
diff --git a/src/post/goom/ifs.h b/src/post/goom/ifs.h
index c91df183a..9cb19514f 100644
--- a/src/post/goom/ifs.h
+++ b/src/post/goom/ifs.h
@@ -22,7 +22,7 @@ void    ifs_update (guint32 * buffer, guint32 * back, int width, int height,
 										int increment);
 
 /* free all ifs's data. */
-void    release_ifs ();
+void    release_ifs (void);
 
 
 /* DONT USE !!! deprecated
diff --git a/src/post/goom/ifs_display.c b/src/post/goom/ifs_display.c
index 53530ccf6..c3d3783f3 100644
--- a/src/post/goom/ifs_display.c
+++ b/src/post/goom/ifs_display.c
@@ -5,7 +5,7 @@
 extern volatile int     use_asm;
 
 #ifdef MMX
-void
+static void
 ifs_fun_mmx(guint32 * data, guint32 * back, int width, int height,
             int increment, int nbpt, IFSPoint *points, int couleursl)
 {
@@ -27,7 +27,7 @@ ifs_fun_mmx(guint32 * data, guint32 * back, int width, int height,
 }
 #endif
 
-void
+static void
 ifs_fun_c(guint32 * data, guint32 * back, int width, int height,
           int increment, int nbpt, IFSPoint *points, int couleursl)
 {
diff --git a/src/post/goom/lines.c b/src/post/goom/lines.c
index 7cda48ef4..e7a9b60e0 100644
--- a/src/post/goom/lines.c
+++ b/src/post/goom/lines.c
@@ -201,7 +201,7 @@ draw_line (int *data, int x1, int y1, int x2, int y2, int col, int screenx,
 	}
 }
 
-void
+static void
 genline (int id, float param, GMUnitPointer * l, int rx, int ry)
 {
 	int     i;
@@ -235,7 +235,7 @@ genline (int id, float param, GMUnitPointer * l, int rx, int ry)
 	}
 }
 
-guint32 getcouleur (int mode)
+static guint32 getcouleur (int mode)
 {
 	switch (mode) {
 	case GML_RED:
@@ -268,7 +268,7 @@ goom_lines_set_res (GMLine * gml, int rx, int ry)
 }
 
 
-void
+static void
 goom_lines_move (GMLine * l)
 {
 	int     i;
@@ -314,7 +314,7 @@ goom_lines_switch_to (GMLine * gml, int IDdest, float param, int col)
 /*  printf ("couleur %d : %x\n",col,gml->color2); */
 }
 
-inline unsigned char
+static inline unsigned char
 lighten (unsigned char value, float power)
 {
 	int     val = value;
@@ -333,7 +333,7 @@ lighten (unsigned char value, float power)
 	}
 }
 
-void
+static void
 lightencolor (int *col, float power)
 {
 	unsigned char *color;
diff --git a/src/post/goom/zoom_filter_mmx.c b/src/post/goom/zoom_filter_mmx.c
index eb364ac86..de8a37096 100644
--- a/src/post/goom/zoom_filter_mmx.c
+++ b/src/post/goom/zoom_filter_mmx.c
@@ -1,5 +1,6 @@
 #include "goom_config.h"
 #include "xineutils.h"
+#include "zoom_filter_mmx.h"
 
 #ifdef MMX
 #define BUFFPOINTNB 16
@@ -13,9 +14,9 @@
 #define PERTEDEC 4
 
 void zoom_filter_mmx (int prevX, int prevY,
-					  unsigned int *expix1, unsigned int *expix2,
-					  int *brutS, int *brutD, int buffratio,
-					  int precalCoef[16][16])
+		      unsigned int *expix1, unsigned int *expix2,
+		      int *brutS, int *brutD, int buffratio,
+		      int precalCoef[16][16])
 {
   unsigned int ax = (prevX-1)<<PERTEDEC, ay = (prevY-1)<<PERTEDEC;
   
diff --git a/src/post/goom/zoom_filter_mmx.h b/src/post/goom/zoom_filter_mmx.h
new file mode 100644
index 000000000..f81f2dca7
--- /dev/null
+++ b/src/post/goom/zoom_filter_mmx.h
@@ -0,0 +1,9 @@
+#ifndef ZOOM_FILTER_MMX_H
+#define ZOOM_FILTER_MMX_H
+
+void zoom_filter_mmx (int prevX, int prevY,
+		      unsigned int *expix1, unsigned int *expix2,
+		      int *brutS, int *brutD, int buffratio,
+		      int precalCoef[16][16]);
+
+#endif
diff --git a/src/video_out/libdha/libdha.h b/src/video_out/libdha/libdha.h
index 850697ada..9984574ca 100644
--- a/src/video_out/libdha/libdha.h
+++ b/src/video_out/libdha/libdha.h
@@ -111,6 +111,9 @@ extern int	hwirq_uninstall(int bus, int dev, int func);
 
 /* CPU flushing support */
 extern void	cpu_flush(void *va,unsigned long length);
+
+extern void     libdha_exit(const char *message, int level);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c
index 8b7b609bb..401be3cff 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.87 2003/08/04 03:47:11 miguelfreitas Exp $
+ * $Id: video_out_syncfb.c,v 1.88 2003/08/25 21:51:48 f1rmb Exp $
  * 
  * video_out_syncfb.c, SyncFB (for Matrox G200/G400 cards) interface for xine
  * 
@@ -132,7 +132,7 @@ typedef struct {
  */
 
 /* returns boolean value (1 success, 0 failure) */
-int syncfb_overlay_on(syncfb_driver_t* this)
+static int syncfb_overlay_on(syncfb_driver_t* this)
 {
    if(ioctl(this->fd, SYNCFB_ON)) {	
       printf("video_out_syncfb: error. (on ioctl failed)\n");
@@ -144,7 +144,7 @@ int syncfb_overlay_on(syncfb_driver_t* this)
 }
 
 /* returns boolean value (1 success, 0 failure) */
-int syncfb_overlay_off(syncfb_driver_t* this)
+static int syncfb_overlay_off(syncfb_driver_t* this)
 {  
    if(ioctl(this->fd, SYNCFB_OFF)) {
       printf("video_out_syncfb: error. (off ioctl failed)\n");
@@ -302,7 +302,7 @@ static void write_frame_sfb(syncfb_driver_t* this, syncfb_frame_t* frame)
    frame->vo_frame.free(&frame->vo_frame);
 }
 
-void free_framedata(syncfb_frame_t* frame)
+static void free_framedata(syncfb_frame_t* frame)
 {
 /*   if(frame->data_mem[0]) {
       free(frame->data_mem[0]);
diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c
index 9b990ea9b..51d7c9f81 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.171 2003/08/04 03:47:11 miguelfreitas Exp $
+ * $Id: video_out_xv.c,v 1.172 2003/08/25 21:51:48 f1rmb Exp $
  *
  * video_out_xv.c, X11 video extension interface for xine
  *
@@ -218,7 +218,7 @@ static vo_frame_t *xv_alloc_frame (vo_driver_t *this_gen) {
   return (vo_frame_t *) frame;
 }
 
-int HandleXError (Display *display, XErrorEvent *xevent) {
+static int HandleXError (Display *display, XErrorEvent *xevent) {
 
   char str [1024];
 
diff --git a/src/video_out/vidix/drivers/cyberblade_vid.c b/src/video_out/vidix/drivers/cyberblade_vid.c
index 423916a4d..b6d9a4ad8 100644
--- a/src/video_out/vidix/drivers/cyberblade_vid.c
+++ b/src/video_out/vidix/drivers/cyberblade_vid.c
@@ -88,7 +88,7 @@ static void SROUTW(int reg,int val)
 	SROUTB(reg+1,(val>>8)&255);
 }
 
-void DumpRegisters()
+static void DumpRegisters(void)
 {
 #ifdef DEBUG_LOGFILE
 	int reg,val;
diff --git a/src/video_out/yuv2rgb.c b/src/video_out/yuv2rgb.c
index 40344d2d7..d60b57dbb 100644
--- a/src/video_out/yuv2rgb.c
+++ b/src/video_out/yuv2rgb.c
@@ -23,7 +23,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: yuv2rgb.c,v 1.43 2003/08/25 14:32:37 mroi Exp $
+ * $Id: yuv2rgb.c,v 1.44 2003/08/25 21:51:50 f1rmb Exp $
  */
 
 #include "config.h"
@@ -3115,7 +3115,7 @@ static void yuy22rgb_c_init (yuv2rgb_factory_t *this)
   }
 }
 
-yuv2rgb_t *yuv2rgb_create_converter (yuv2rgb_factory_t *factory) {
+static yuv2rgb_t *yuv2rgb_create_converter (yuv2rgb_factory_t *factory) {
 
   yuv2rgb_t *this = xine_xmalloc (sizeof (yuv2rgb_t));
   
diff --git a/src/xine-engine/video_overlay.c b/src/xine-engine/video_overlay.c
index 71622b6a8..cfe8c19d5 100644
--- a/src/xine-engine/video_overlay.c
+++ b/src/xine-engine/video_overlay.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_overlay.c,v 1.30 2003/08/15 14:35:09 mroi Exp $
+ * $Id: video_overlay.c,v 1.31 2003/08/25 21:51:52 f1rmb Exp $
  *
  */
 
@@ -575,7 +575,7 @@ static void video_overlay_dispose(video_overlay_manager_t *this_gen) {
 }
 
 
-video_overlay_manager_t *video_overlay_new_manager () {
+video_overlay_manager_t *video_overlay_new_manager (void) {
 
   video_overlay_t *this;
 
diff --git a/src/xine-engine/video_overlay.h b/src/xine-engine/video_overlay.h
index 04c417255..b27b72ef3 100644
--- a/src/xine-engine/video_overlay.h
+++ b/src/xine-engine/video_overlay.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: video_overlay.h,v 1.14 2003/05/20 13:50:57 mroi Exp $
+ * $Id: video_overlay.h,v 1.15 2003/08/25 21:51:52 f1rmb Exp $
  *
  */
 
@@ -101,4 +101,6 @@ typedef struct video_overlay_event_s {
   video_overlay_object_t   object; /* The image data. */
 } video_overlay_event_t;
 
+video_overlay_manager_t *video_overlay_new_manager(void);
+
 #endif