tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7473 b3059339-0415-0410-9bf9-f77b7e298cf2

8 files changed, 10 insertions, 28 deletions

diff --git a/libvo/mga_common.c b/libvo/mga_common.c
index ac46916021..67f129f5f3 100644
--- a/libvo/mga_common.c
+++ b/libvo/mga_common.c
@@ -15,7 +15,6 @@ static uint8_t *vid_data, *frames[4];
 static int f = -1;
 
 static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride){
-    int x,y;
     uint32_t bespitch = (mga_vid_config.src_width + 31) & ~31;
     switch(mga_vid_config.format){
     case MGA_VID_FORMAT_YV12:
@@ -38,12 +37,8 @@ static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned
 static void
 draw_slice_g200(uint8_t *image[], int stride[], int width,int height,int x,int y)
 {
-	uint8_t *src;
-	uint8_t *src2;
 	uint8_t *dest;
-	uint32_t bespitch,h,w;
-
-	bespitch = (mga_vid_config.src_width + 31) & ~31;
+	uint32_t bespitch = (mga_vid_config.src_width + 31) & ~31;
 
 	dest = vid_data + bespitch*y + x;
 	mem2agpcpy_pic(dest, image[0], width, height, bespitch, stride[0]);
@@ -60,11 +55,9 @@ draw_slice_g200(uint8_t *image[], int stride[], int width,int height,int x,int y
 static void
 draw_slice_g400(uint8_t *image[], int stride[], int w,int h,int x,int y)
 {
-    uint8_t *src;
     uint8_t *dest;
     uint8_t *dest2;
     uint32_t bespitch,bespitch2;
-    int i;
 
     bespitch = (mga_vid_config.src_width + 31) & ~31;
     bespitch2 = bespitch/2;
@@ -327,7 +320,6 @@ static uint32_t control(uint32_t request, void *data, ...)
 
 
 static int mga_init(){
-	char *frame_mem;
 
 	mga_vid_config.num_frames=(vo_directrendering && !vo_doublebuffering)?1:3;
 	mga_vid_config.version=MGA_VID_VERSION;
@@ -360,6 +352,7 @@ static int mga_uninit(){
 	munmap(frames[0],mga_vid_config.frame_size*mga_vid_config.num_frames);
 	close(f);
 	f = -1;
+  return 0;
 }
 
 static uint32_t preinit(const char *arg)
diff --git a/libvo/spuenc.c b/libvo/spuenc.c
index e2cb9438ea..561774111a 100644
--- a/libvo/spuenc.c
+++ b/libvo/spuenc.c
@@ -210,9 +210,6 @@ void
 pixbuf_encode_rle(int x, int y, int w, int h, char *inbuf,  int stride,encodedata *ed){
        	pixbuf pb;
 	int i, row;
-	int lx,ly;
-	int c;
-	unsigned char *pixbuffer;
 	pb.x = w;
 	pb.y = h;
 
diff --git a/libvo/vo_gif89a.c b/libvo/vo_gif89a.c
index c31498bc7e..af94210135 100644
--- a/libvo/vo_gif89a.c
+++ b/libvo/vo_gif89a.c
@@ -15,6 +15,7 @@
 #include "config.h"
 #include "video_out.h"
 #include "video_out_internal.h"
+#include "sub.h"
 
 #include "../postproc/rgb2rgb.h"
 
diff --git a/libvo/vo_jpeg.c b/libvo/vo_jpeg.c
index 277915402c..51af4f91f4 100644
--- a/libvo/vo_jpeg.c
+++ b/libvo/vo_jpeg.c
@@ -17,6 +17,7 @@
 #include "config.h"
 #include "video_out.h"
 #include "video_out_internal.h"
+#include "sub.h"
 
 #include "../postproc/swscale.h"
 #include "../postproc/rgb2rgb.h"
diff --git a/libvo/vo_png.c b/libvo/vo_png.c
index 16c364019c..e616c4c9c2 100644
--- a/libvo/vo_png.c
+++ b/libvo/vo_png.c
@@ -21,6 +21,7 @@
 #include "config.h"
 #include "video_out.h"
 #include "video_out_internal.h"
+#include "sub.h"
 
 #include "../postproc/rgb2rgb.h"
 
diff --git a/libvo/vo_svga.c b/libvo/vo_svga.c
index 0c15abf02d..bb6e87a231 100644
--- a/libvo/vo_svga.c
+++ b/libvo/vo_svga.c
@@ -8,6 +8,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <vga.h>
 
diff --git a/libvo/vo_xmga.c b/libvo/vo_xmga.c
index dc1d105fba..e25617229d 100644
--- a/libvo/vo_xmga.c
+++ b/libvo/vo_xmga.c
@@ -75,9 +75,7 @@ static vo_info_t vo_info =
 
 static XGCValues              wGCV;
 
-static XImage               * myximage;
-
-static uint32_t               mDepth, bpp, mode;
+static uint32_t               mDepth;
 static XWindowAttributes      attribs;
 static uint32_t               fgColor;
 
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c
index 221a70345d..f9c2939b5f 100644
--- a/libvo/vo_xv.c
+++ b/libvo/vo_xv.c
@@ -65,14 +65,6 @@ static vo_info_t vo_info =
         ""
 };
 
-/* local data */
-static unsigned char *ImageData;
-
-/* X11 related variables */
-static XImage *myximage;
-static int depth, bpp, mode;
-static XWindowAttributes attribs;
-
 #include <X11/extensions/Xv.h>
 #include <X11/extensions/Xvlib.h>
 // FIXME: dynamically allocate this stuff
@@ -99,8 +91,6 @@ static XShmSegmentInfo Shminfo[NUM_BUFFERS];
 static int Shmem_Flag;
 #endif
 
-static int gXErrorFlag;
-
 static uint32_t image_width;
 static uint32_t image_height;
 static uint32_t image_format;
@@ -219,7 +209,7 @@ static int xv_get_eq(char *name, int *value)
    then trigger it if it's ok so that the other values are at default upon query */
                 if (xv_atom != None)
                 {
-		    int val, port_value=0, port_min, port_max, port_mid;
+		    int val, port_value=0, port_min, port_max;
 
 		    XvGetPortAttribute(mDisplay, xv_port, xv_atom, &port_value);
 
@@ -279,11 +269,11 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32
 // char *name = ":0.0";
  XSizeHints hint;
  XVisualInfo vinfo;
- XEvent xev;
-
  XGCValues xgcv;
  XSetWindowAttributes xswa;
+ XWindowAttributes attribs;
  unsigned long xswamask;
+ int depth;
 #ifdef HAVE_XF86VM
  int vm=0;
  unsigned int modeline_width, modeline_height;