Fix a few compile warnings.

CVS patchset: 1397
CVS date: 2002/01/13 21:15:48

7 files changed, 19 insertions, 8 deletions

diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c
index 9961d5619..17e10c138 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.32 2002/01/02 18:16:07 jkeil Exp $
+ * $Id: demux_mpgaudio.c,v 1.33 2002/01/13 21:15:48 jcdutton Exp $
  *
  * demultiplexer for mpeg audio (i.e. mp3) streams
  *
@@ -251,6 +251,8 @@ static void *demux_mpgaudio_loop (void *this_gen) {
   }
 
   pthread_exit(NULL);
+
+  return NULL;
 }
 
 static void demux_mpgaudio_stop (demux_plugin_t *this_gen) {
diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c
index 34c27f219..54bcd6c8e 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.34 2002/01/09 20:20:45 jcdutton Exp $
+ * $Id: demux_ts.c,v 1.35 2002/01/13 21:15:48 jcdutton Exp $
  *
  * Demultiplexer for MPEG2 Transport Streams.
  *
@@ -728,7 +728,7 @@ static void demux_ts_parse_pmt (demux_ts      *this,
     return;
   }
 
-#ifdef TS_PMT LOG
+#ifdef TS_PMT_LOG
   printf ("ts_demux: have all TS packets for the PMT section\n");
 #endif
 
diff --git a/src/libmpeg2/decode.c b/src/libmpeg2/decode.c
index c74bc7339..2c2a25de2 100644
--- a/src/libmpeg2/decode.c
+++ b/src/libmpeg2/decode.c
@@ -44,6 +44,8 @@
 
 mpeg2_config_t config;
 
+static void process_userdata(mpeg2dec_t *mpeg2dec, uint8_t *buffer);
+
 void mpeg2_init (mpeg2dec_t * mpeg2dec, 
 		 vo_instance_t * output)
 {
diff --git a/src/libmpeg2/mpeg2.h b/src/libmpeg2/mpeg2.h
index 983eb9eaa..cd4f9610a 100644
--- a/src/libmpeg2/mpeg2.h
+++ b/src/libmpeg2/mpeg2.h
@@ -65,4 +65,7 @@ void mpeg2_find_sequence_header (mpeg2dec_t * mpeg2dec,
 
 void mpeg2_flush (mpeg2dec_t * mpeg2dec);
 
-void process_userdata(mpeg2dec_t *mpeg2dec, uint8_t *buffer);
+/* Not needed, it is defined as static in decode.c, and no-one else called it
+ * currently
+ */
+/* void process_userdata(mpeg2dec_t *mpeg2dec, uint8_t *buffer); */
diff --git a/src/video_out/deinterlace.c b/src/video_out/deinterlace.c
index 9b057f51d..73fe341ab 100644
--- a/src/video_out/deinterlace.c
+++ b/src/video_out/deinterlace.c
@@ -641,7 +641,7 @@ static void abort_mmx_missing(void)
 {
   printf("deinterlace: Fatal error, MMX instruction set needed!\n");
   /* FIXME: is it possible to call some "nicer" xine exit function? */
-  exit(1);
+  _exit(1);
 }
 
 /* generic YUV deinterlacer
diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c
index d3652485e..77538d71e 100644
--- a/src/xine-engine/configfile.c
+++ b/src/xine-engine/configfile.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: configfile.c,v 1.14 2002/01/09 15:16:37 mshopf Exp $
+ * $Id: configfile.c,v 1.15 2002/01/13 21:15:48 jcdutton Exp $
  *
  * config file management - implementation
  *
@@ -567,7 +567,7 @@ config_values_t *config_file_init (char *filename) {
     this->first = NULL;
     this->last  = NULL;
 
-    config_file_read (this, filename);
+    config_file_read (&this, filename);
    
   } else {
     printf ("configfile: could not allocate config object\n");
@@ -592,6 +592,9 @@ config_values_t *config_file_init (char *filename) {
 
 /*
  * $Log: configfile.c,v $
+ * Revision 1.15  2002/01/13 21:15:48  jcdutton
+ * Fix a few compile warnings.
+ *
  * Revision 1.14  2002/01/09 15:16:37  mshopf
  * IRIX port finally compiles (and actually works) again.
  *
diff --git a/src/xine-engine/scratch.c b/src/xine-engine/scratch.c
index cf869e507..364f85d09 100644
--- a/src/xine-engine/scratch.c
+++ b/src/xine-engine/scratch.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: scratch.c,v 1.4 2001/12/11 23:59:00 f1rmb Exp $
+ * $Id: scratch.c,v 1.5 2002/01/13 21:15:48 jcdutton Exp $
  *
  * top-level xine functions
  *
@@ -29,6 +29,7 @@
 
 #include <stdio.h>
 #include <stdarg.h>
+#include <string.h>  /* For memset */
 
 #include "scratch.h"
 #include "xineutils.h"