Merge svn changes up to r30595

Conflicts:
	mplayer.c
	vidix/nvidia_vid.c

6 files changed, 34 insertions, 6 deletions

diff --git a/vidix/drivers.c b/vidix/drivers.c
index 559dee30e0..7968156662 100644
--- a/vidix/drivers.c
+++ b/vidix/drivers.c
@@ -27,6 +27,7 @@
 #include "drivers.h"
 #include "config.h"
 #include "vidix.h"
+#include "drivers.h"
 #include "libavutil/common.h"
 #include "mpbswap.h"
 #include "config.h"
diff --git a/vidix/nvidia_vid.c b/vidix/nvidia_vid.c
index 79f3880ebd..6c3786a815 100644
--- a/vidix/nvidia_vid.c
+++ b/vidix/nvidia_vid.c
@@ -441,12 +441,14 @@ struct rivatv_info {
 };
 typedef struct rivatv_info rivatv_info;
 
-static uint8_t nvReadVGA (struct rivatv_chip *chip, int index) {
+static uint8_t nvReadVGA(struct rivatv_chip *chip, int index)
+{
 	VID_WR08 (chip->PCIO, 0x3D4, index);
 	return VID_RD08 (chip->PCIO, 0x3D5);
 }
 
-static void nvWriteVGA (struct rivatv_chip *chip, int index, int data) {
+static void nvWriteVGA(struct rivatv_chip *chip, int index, int data)
+{
 	VID_WR08 (chip->PCIO, 0x3D4, index);
 	VID_WR08 (chip->PCIO, 0x3D5, data);
 }
diff --git a/vidix/sis_bridge.c b/vidix/sis_bridge.c
index f143754a9a..265bce5fd3 100644
--- a/vidix/sis_bridge.c
+++ b/vidix/sis_bridge.c
@@ -28,6 +28,7 @@
 #include <unistd.h>
 
 #include "dha.h"
+#include "sis_bridge.h"
 #include "sis_regs.h"
 #include "sis_defs.h"
 
diff --git a/vidix/sis_bridge.h b/vidix/sis_bridge.h
new file mode 100644
index 0000000000..d06488fad8
--- /dev/null
+++ b/vidix/sis_bridge.h
@@ -0,0 +1,26 @@
+/*
+ * VIDIX - VIDeo Interface for *niX.
+ *
+ * This file is part of MPlayer.
+ *
+ * MPlayer 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.
+ *
+ * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPLAYER_SIS_BRIDGE_H
+#define MPLAYER_SIS_BRIDGE_H
+
+void sis_init_video_bridge(void);
+
+#endif /* MPLAYER_SIS_BRIDGE_H */
diff --git a/vidix/sis_vid.c b/vidix/sis_vid.c
index 0f5960cf54..4d82755bdf 100644
--- a/vidix/sis_vid.c
+++ b/vidix/sis_vid.c
@@ -37,6 +37,7 @@
 #include "pci_ids.h"
 #include "pci_names.h"
 
+#include "sis_bridge.h"
 #include "sis_regs.h"
 #include "sis_defs.h"
 
@@ -167,9 +168,6 @@ static unsigned short sis_card_ids[] = {
 
 /** function declarations **/
 
-void sis_init_video_bridge(void);
-
-
 static void set_overlay(SISOverlayPtr pOverlay, int index);
 static void close_overlay(void);
 static void calc_scale_factor(SISOverlayPtr pOverlay,
diff --git a/vidix/vidix.c b/vidix/vidix.c
index adb5613948..8fe02e4836 100644
--- a/vidix/vidix.c
+++ b/vidix/vidix.c
@@ -153,7 +153,7 @@ int vdlPlaybackSetEq (VDXContext *ctx, const vidix_video_eq_t *e)
   return ctx->drv->set_eq ? ctx->drv->set_eq (e) : ENOSYS;
 }
 
-int vdlPlaybackCopyFrame (VDXContext *ctx, const vidix_dma_t *f)
+static int vdlPlaybackCopyFrame(VDXContext *ctx, const vidix_dma_t *f)
 {
   return ctx->drv->copy_frame ? ctx->drv->copy_frame (f) : ENOSYS;
 }