From 45defa1aa0bb0b7168702023baec6edd77c0a364 Mon Sep 17 00:00:00 2001
From: rathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 5 Feb 2007 23:46:08 +0000
Subject: [PATCH] Fix a few gcc warnings, approved by Diego and Reimar.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22160 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libao2/ao_polyp.c       | 2 +-
 libmpdemux/demuxer.c    | 1 +
 libmpdemux/muxer_mpeg.c | 4 ++--
 libvo/mga_common.c      | 1 +
 stream/cache2.c         | 3 +--
 stream/network.c        | 2 --
 stream/tcp.c            | 1 +
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libao2/ao_polyp.c b/libao2/ao_polyp.c
index 7ba940d6b4..22239762a2 100644
--- a/libao2/ao_polyp.c
+++ b/libao2/ao_polyp.c
@@ -246,8 +246,8 @@ static int get_space(void) {
 
 /** 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)); */
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 746452f5b2..f41a8b4ffc 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -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
diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c
index 35d32900ab..c3978128f3 100644
--- a/libmpdemux/muxer_mpeg.c
+++ b/libmpdemux/muxer_mpeg.c
@@ -872,7 +872,7 @@ static int write_mpeg_pack(muxer_t *muxer, muxer_stream_t *s, stream_t *stream,
 	}
 }
 
-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 @@ static int update_demux_bufsize(muxer_headers_t *spriv, uint64_t dts, int framel
 		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));
diff --git a/libvo/mga_common.c b/libvo/mga_common.c
index a7f9e01ed9..3114b12739 100644
--- a/libvo/mga_common.c
+++ b/libvo/mga_common.c
@@ -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"
diff --git a/stream/cache2.c b/stream/cache2.c
index 6ad33d8664..0e6f2eef9b 100644
--- a/stream/cache2.c
+++ b/stream/cache2.c
@@ -28,12 +28,11 @@ static DWORD WINAPI ThreadProc(void* s);
 #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
diff --git a/stream/network.c b/stream/network.c
index 506474b6cd..8ac983ebe1 100644
--- a/stream/network.c
+++ b/stream/network.c
@@ -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 */
 
diff --git a/stream/tcp.c b/stream/tcp.c
index a9b868c4d0..ad7e1d9398 100644
--- a/stream/tcp.c
+++ b/stream/tcp.c
@@ -19,6 +19,7 @@
 
 #include "mp_msg.h"
 #include "help_mp.h"
+#include "input/input.h"
 
 #ifndef HAVE_WINSOCK2
 #include <netdb.h>