[Mplayer-cvslog] CVS: main/libvo vo_xv.c,1.148,1.149

[pl CVS]

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

Modified Files:
	vo_xv.c 
Log Message:
fix some warnings (define order)
remove the static 'i' variable for the module


Index: vo_xv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- vo_xv.c	7 Sep 2003 18:58:56 -0000	1.148
+++ vo_xv.c	12 Sep 2003 15:50:35 -0000	1.149
@@ -50,12 +50,26 @@
 
 LIBVO_EXTERN(xv)
 
+#ifdef HAVE_SHM
+#include <sys/ipc.h>
+#include <sys/shm.h>
+#include <X11/extensions/XShm.h>
+
+/* since it doesn't seem to be defined on some platforms */
+int XShmGetEventBase(Display*);
+
+static XShmSegmentInfo Shminfo[NUM_BUFFERS];
+static int Shmem_Flag;
+#endif
+
+// Note: depends on the inclusion of X11/extensions/XShm.h
 #include <X11/extensions/Xv.h>
 #include <X11/extensions/Xvlib.h>
+
 // FIXME: dynamically allocate this stuff
 static void allocate_xvimage(int);
 static unsigned int ver,rel,req,ev,err;
-static unsigned int formats, adaptors,i,xv_port,xv_format;
+static unsigned int formats, adaptors, xv_port, xv_format;
 static XvAdaptorInfo        *ai = NULL;
 static XvImageFormatValues  *fo;
 
@@ -64,17 +78,6 @@
 static int num_buffers=1; // default
 static XvImage* xvimage[NUM_BUFFERS];
 
-#ifdef HAVE_SHM
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <X11/extensions/XShm.h>
-
-/* since it doesn't seem to be defined on some platforms */
-int XShmGetEventBase(Display*);
-
-static XShmSegmentInfo Shminfo[NUM_BUFFERS];
-static int Shmem_Flag;
-#endif
 
 static uint32_t image_width;
 static uint32_t image_height;
@@ -163,13 +166,16 @@
  num_buffers=vo_doublebuffering?(vo_directrendering?NUM_BUFFERS:2):1;
 
    /* check image formats */
+   {
+     unsigned int i;
+
      xv_format=0;
      for(i = 0; i < formats; i++){
        mp_msg(MSGT_VO,MSGL_V,"Xvideo image format: 0x%x (%4.4s) %s\n", fo[i].id,(char*)&fo[i].id, (fo[i].format == XvPacked) ? "packed" : "planar");
        if (fo[i].id == format) xv_format = fo[i].id;
      }
      if (!xv_format) return -1;
- 
+   }
  aspect_save_screenres(vo_screenwidth,vo_screenheight);
 
 #ifdef HAVE_NEW_GUI
@@ -565,6 +571,7 @@
 
 static uint32_t query_format(uint32_t format)
 {
+    uint32_t i;
     int flag=VFCAP_CSP_SUPPORTED|VFCAP_CSP_SUPPORTED_BY_HW|
 	    VFCAP_HWSCALE_UP|VFCAP_HWSCALE_DOWN|VFCAP_OSD|VFCAP_ACCEPT_STRIDE; // FIXME! check for DOWN
    /* check image formats */
@@ -592,6 +599,7 @@
 {
     XvPortID xv_p;
     int busy_ports=0;
+    unsigned int i;
     
     xv_port = 0;