[Mplayer-cvslog] CVS: main/libvo mga_common.c,1.39,1.40 spuenc.c,1.3,1.4 vo_gif89a.c,1.4,1.5 vo_jpeg.c,1.5,1.6 vo_png.c,1.18,1.19 vo_svga.c,1.50,1.51 vo_xmga.c,1.76,1.77 vo_xv.c,1.115,1.116

Arpi of Ize arpi at mplayerhq.hu
Sun Sep 22 04:33:29 CEST 2002


Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv24466/libvo

Modified Files:
	mga_common.c spuenc.c vo_gif89a.c vo_jpeg.c vo_png.c vo_svga.c 
	vo_xmga.c vo_xv.c 
Log Message:
tons of warning fixes, also some 10l bugfixes, including Dominik's PVA bug


Index: mga_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/mga_common.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- mga_common.c	25 Jul 2002 21:36:04 -0000	1.39
+++ mga_common.c	22 Sep 2002 02:33:26 -0000	1.40
@@ -15,7 +15,6 @@
 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_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 @@
 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 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 @@
 	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)

Index: spuenc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/spuenc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- spuenc.c	31 Jul 2002 05:23:09 -0000	1.3
+++ spuenc.c	22 Sep 2002 02:33:26 -0000	1.4
@@ -210,9 +210,6 @@
 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;
 

Index: vo_gif89a.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gif89a.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vo_gif89a.c	28 Aug 2002 21:32:32 -0000	1.4
+++ vo_gif89a.c	22 Sep 2002 02:33:26 -0000	1.5
@@ -15,6 +15,7 @@
 #include "config.h"
 #include "video_out.h"
 #include "video_out_internal.h"
+#include "sub.h"
 
 #include "../postproc/rgb2rgb.h"
 

Index: vo_jpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_jpeg.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vo_jpeg.c	28 Aug 2002 21:32:32 -0000	1.5
+++ vo_jpeg.c	22 Sep 2002 02:33:26 -0000	1.6
@@ -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"

Index: vo_png.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_png.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- vo_png.c	28 Aug 2002 21:32:32 -0000	1.18
+++ vo_png.c	22 Sep 2002 02:33:26 -0000	1.19
@@ -21,6 +21,7 @@
 #include "config.h"
 #include "video_out.h"
 #include "video_out_internal.h"
+#include "sub.h"
 
 #include "../postproc/rgb2rgb.h"
 

Index: vo_svga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_svga.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- vo_svga.c	28 Aug 2002 21:32:32 -0000	1.50
+++ vo_svga.c	22 Sep 2002 02:33:26 -0000	1.51
@@ -8,6 +8,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <vga.h>
 

Index: vo_xmga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xmga.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- vo_xmga.c	28 Aug 2002 21:32:32 -0000	1.76
+++ vo_xmga.c	22 Sep 2002 02:33:26 -0000	1.77
@@ -75,9 +75,7 @@
 
 static XGCValues              wGCV;
 
-static XImage               * myximage;
-
-static uint32_t               mDepth, bpp, mode;
+static uint32_t               mDepth;
 static XWindowAttributes      attribs;
 static uint32_t               fgColor;
 

Index: vo_xv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- vo_xv.c	28 Aug 2002 21:32:32 -0000	1.115
+++ vo_xv.c	22 Sep 2002 02:33:26 -0000	1.116
@@ -65,14 +65,6 @@
         ""
 };
 
-/* 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 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 @@
    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 @@
 // 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;




More information about the MPlayer-cvslog mailing list