[MPlayer-cvslog] r22160 - in trunk: libao2/ao_polyp.c libmpdemux/demuxer.c libmpdemux/muxer_mpeg.c libvo/mga_common.c stream/cache2.c stream/network.c stream/tcp.c

[rathann]

Author: rathann
Date: Tue Feb  6 00:46:08 2007
New Revision: 22160

Modified:
   trunk/libao2/ao_polyp.c
   trunk/libmpdemux/demuxer.c
   trunk/libmpdemux/muxer_mpeg.c
   trunk/libvo/mga_common.c
   trunk/stream/cache2.c
   trunk/stream/network.c
   trunk/stream/tcp.c

Log:
Fix a few gcc warnings, approved by Diego and Reimar.


Modified: trunk/libao2/ao_polyp.c
==============================================================================
--- trunk/libao2/ao_polyp.c	(original)
+++ trunk/libao2/ao_polyp.c	Tue Feb  6 00:46:08 2007
@@ -246,8 +246,8 @@
 
 /** Return the current latency in seconds */
 static float get_delay(void) {
-    assert(stream && context && pa_stream_get_state(stream) == PA_STREAM_READY);
     pa_usec_t latency;
+    assert(stream && context && pa_stream_get_state(stream) == PA_STREAM_READY);
 
     /*     latency = 0; */
 /*     wait_for_operation(pa_stream_get_latency(stream, latency_func, NULL)); */

Modified: trunk/libmpdemux/demuxer.c
==============================================================================
--- trunk/libmpdemux/demuxer.c	(original)
+++ trunk/libmpdemux/demuxer.c	Tue Feb  6 00:46:08 2007
@@ -22,6 +22,7 @@
 
 #include "libaf/af_format.h"
 
+extern void resync_video_stream(sh_video_t *sh_video);
 extern void resync_audio_stream(sh_audio_t *sh_audio);
 
 // Demuxer list

Modified: trunk/libmpdemux/muxer_mpeg.c
==============================================================================
--- trunk/libmpdemux/muxer_mpeg.c	(original)
+++ trunk/libmpdemux/muxer_mpeg.c	Tue Feb  6 00:46:08 2007
@@ -872,7 +872,7 @@
 	}
 }
 
-static int update_demux_bufsize(muxer_headers_t *spriv, uint64_t dts, int framelen, int type)
+static void update_demux_bufsize(muxer_headers_t *spriv, uint64_t dts, int framelen, int type)
 {
 	int dim = (spriv->track_len+16)*sizeof(buffer_track_t);
 
@@ -882,7 +882,7 @@
 		if(!tmp)
 		{
 			mp_msg(MSGT_MUXER, MSGL_ERR, "\r\nERROR, couldn't realloc %d bytes for tracking buffer\r\n", dim);
-			return 0;
+			return;
 		}
 		spriv->buffer_track = tmp;
 		memset(&(spriv->buffer_track[spriv->track_pos+1]), 0, 16*sizeof(buffer_track_t));

Modified: trunk/libvo/mga_common.c
==============================================================================
--- trunk/libvo/mga_common.c	(original)
+++ trunk/libvo/mga_common.c	Tue Feb  6 00:46:08 2007
@@ -2,6 +2,7 @@
 #include "fastmemcpy.h"
 #include "cpudetect.h"
 #include "libswscale/swscale.h"
+#include "libswscale/rgb2rgb.h"
 #include "libmpcodecs/vf_scale.h"
 #include "mp_msg.h"
 #include "help_mp.h"

Modified: trunk/stream/cache2.c
==============================================================================
--- trunk/stream/cache2.c	(original)
+++ trunk/stream/cache2.c	Tue Feb  6 00:46:08 2007
@@ -28,12 +28,11 @@
 #include "help_mp.h"
 
 #include "stream.h"
+#include "input/input.h"
 
 int stream_fill_buffer(stream_t *s);
 int stream_seek_long(stream_t *s,off_t pos);
 
-extern int mp_input_check_interrupt(int time);
-
 typedef struct {
   // constats:
   unsigned char *buffer;      // base pointer of the alllocated buffer memory

Modified: trunk/stream/network.c
==============================================================================
--- trunk/stream/network.c	(original)
+++ trunk/stream/network.c	Tue Feb  6 00:46:08 2007
@@ -40,8 +40,6 @@
 
 extern int stream_cache_size;
 
-extern int mp_input_check_interrupt(int time);
-
 /* Variables for the command line option -user, -passwd, -bandwidth,
    -user-agent and -nocookies */
 

Modified: trunk/stream/tcp.c
==============================================================================
--- trunk/stream/tcp.c	(original)
+++ trunk/stream/tcp.c	Tue Feb  6 00:46:08 2007
@@ -19,6 +19,7 @@
 
 #include "mp_msg.h"
 #include "help_mp.h"
+#include "input/input.h"
 
 #ifndef HAVE_WINSOCK2
 #include <netdb.h>