[Mplayer-cvslog] CVS: main/libvo vo_3dfx.c,1.11,1.12 vo_aa.c,1.20,1.21 vo_dga.c,1.40,1.41 vo_directfb.c,1.10,1.11 vo_dxr3.c,1.45,1.46 vo_fbdev.c,1.60,1.61 vo_fsdga.c,1.9,1.10 vo_ggi.c,1.14,1.15 vo_gl.c,1.21,1.22 vo_gl2.c,1.14,1.15 vo_md5.c,1.10,1.11 vo_mga.c,1.24,1.25 vo_mpegpes.c,1.19,1.20 vo_null.c,1.6,1.7 vo_odivx.c,1.10,1.11 vo_pgm.c,1.10,1.11 vo_png.c,1.12,1.13 vo_sdl.c,1.66,1.67 vo_svga.c,1.42,1.43 vo_syncfb.c,1.10,1.11 vo_tdfxfb.c,1.6,1.7 vo_vesa.c,1.66,1.67 vo_x11.c,1.59,1.60 vo_xmga.c,1.44,1.45 vo_xv.c,1.52,1.53 vo_xvidix.c,1.19,1.20 vo_zr.c,1.8,1.9

Arpi of Ize arpi at mplayer.dev.hu
Sat Feb 9 02:21:51 CET 2002


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

Modified Files:
	vo_3dfx.c vo_aa.c vo_dga.c vo_directfb.c vo_dxr3.c vo_fbdev.c 
	vo_fsdga.c vo_ggi.c vo_gl.c vo_gl2.c vo_md5.c vo_mga.c 
	vo_mpegpes.c vo_null.c vo_odivx.c vo_pgm.c vo_png.c vo_sdl.c 
	vo_svga.c vo_syncfb.c vo_tdfxfb.c vo_vesa.c vo_x11.c vo_xmga.c 
	vo_xv.c vo_xvidix.c vo_zr.c 
Log Message:
10000hl to Holm... control MUST BE static...

Index: vo_3dfx.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_3dfx.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- vo_3dfx.c	9 Feb 2002 00:47:26 -0000	1.11
+++ vo_3dfx.c	9 Feb 2002 01:21:48 -0000	1.12
@@ -493,7 +493,7 @@
   return 0;
 }
 
-uint32_t control(uint32_t request, void *data, ...)
+static uint32_t control(uint32_t request, void *data, ...)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:

Index: vo_aa.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_aa.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- vo_aa.c	9 Feb 2002 00:47:26 -0000	1.20
+++ vo_aa.c	9 Feb 2002 01:21:48 -0000	1.21
@@ -757,7 +757,7 @@
   return 0;
 }
 
-uint32_t control(uint32_t request, void *data, ...)
+static uint32_t control(uint32_t request, void *data, ...)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:

Index: vo_dga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dga.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- vo_dga.c	9 Feb 2002 00:47:26 -0000	1.40
+++ vo_dga.c	9 Feb 2002 01:21:48 -0000	1.41
@@ -23,6 +23,9 @@
  * - works only on x86 architectures
  *
  * $Log$
+ * Revision 1.41  2002/02/09 01:21:48  arpi
+ * 10000hl to Holm... control MUST BE static...
+ *
  * Revision 1.40  2002/02/09 00:47:26  arpi
  * query_ stuff replaced by new control() - patch by David Holm
  *
@@ -1179,7 +1182,7 @@
   return 0;
 }
 
-uint32_t control(uint32_t request, void *data, ...)
+static uint32_t control(uint32_t request, void *data, ...)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:

Index: vo_directfb.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_directfb.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- vo_directfb.c	9 Feb 2002 00:47:26 -0000	1.10
+++ vo_directfb.c	9 Feb 2002 01:21:48 -0000	1.11
@@ -888,7 +888,7 @@
 
 }
 
-uint32_t control(uint32_t request, void *data, ...)
+static uint32_t control(uint32_t request, void *data, ...)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:

Index: vo_dxr3.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dxr3.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- vo_dxr3.c	9 Feb 2002 00:47:26 -0000	1.45
+++ vo_dxr3.c	9 Feb 2002 01:21:48 -0000	1.46
@@ -92,7 +92,7 @@
 	""
 };
 
-uint32_t control(uint32_t request, void *data, ...)
+static uint32_t control(uint32_t request, void *data, ...)
 {
 	uint32_t flag = 0;
 	switch (request) {

Index: vo_fbdev.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_fbdev.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- vo_fbdev.c	9 Feb 2002 00:47:26 -0000	1.60
+++ vo_fbdev.c	9 Feb 2002 01:21:48 -0000	1.61
@@ -1339,7 +1339,7 @@
     if(!pre_init_err) return (pre_init_err=(fb_preinit()?0:-1));
 }
 
-uint32_t control(uint32_t request, void *data, ...)
+static uint32_t control(uint32_t request, void *data, ...)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:

Index: vo_fsdga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_fsdga.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vo_fsdga.c	9 Feb 2002 00:47:26 -0000	1.9
+++ vo_fsdga.c	9 Feb 2002 01:21:48 -0000	1.10
@@ -461,7 +461,7 @@
   return 0;
 }
 
-uint32_t control(uint32_t request, void *data, ...)
+static uint32_t control(uint32_t request, void *data, ...)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:

Index: vo_ggi.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_ggi.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- vo_ggi.c	9 Feb 2002 00:47:26 -0000	1.14
+++ vo_ggi.c	9 Feb 2002 01:21:48 -0000	1.15
@@ -771,7 +771,7 @@
   return 0;
 }
 
-uint32_t control(uint32_t request, void *data, ...)
+static uint32_t control(uint32_t request, void *data, ...)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:

Index: vo_gl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- vo_gl.c	9 Feb 2002 00:47:26 -0000	1.21
+++ vo_gl.c	9 Feb 2002 01:21:48 -0000	1.22
@@ -474,7 +474,7 @@
   return 0;
 }
 
-uint32_t control(uint32_t request, void *data, ...)
+static uint32_t control(uint32_t request, void *data, ...)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:

Index: vo_gl2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl2.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- vo_gl2.c	9 Feb 2002 00:47:26 -0000	1.14
+++ vo_gl2.c	9 Feb 2002 01:21:48 -0000	1.15
@@ -1101,7 +1101,7 @@
   return 0;
 }
 
-uint32_t control(uint32_t request, void *data, ...)
+static uint32_t control(uint32_t request, void *data, ...)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:

Index: vo_md5.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_md5.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- vo_md5.c	9 Feb 2002 00:47:26 -0000	1.10
+++ vo_md5.c	9 Feb 2002 01:21:48 -0000	1.11
@@ -108,7 +108,7 @@
   return 0;
 }
 
-uint32_t control(uint32_t request, void *data, ...)
+static uint32_t control(uint32_t request, void *data, ...)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:

Index: vo_mga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_mga.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- vo_mga.c	9 Feb 2002 01:10:22 -0000	1.24
+++ vo_mga.c	9 Feb 2002 01:21:48 -0000	1.25
@@ -171,7 +171,7 @@
   return 0;
 }
 
-uint32_t control(uint32_t request, void *data, ...)
+static uint32_t control(uint32_t request, void *data, ...)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:

Index: vo_mpegpes.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_mpegpes.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- vo_mpegpes.c	9 Feb 2002 00:47:26 -0000	1.19
+++ vo_mpegpes.c	9 Feb 2002 01:21:48 -0000	1.20
@@ -516,7 +516,7 @@
   return 0;
 }
 
-uint32_t control(uint32_t request, void *data, ...)
+static uint32_t control(uint32_t request, void *data, ...)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:

Index: vo_null.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_null.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vo_null.c	9 Feb 2002 00:47:26 -0000	1.6
+++ vo_null.c	9 Feb 2002 01:21:48 -0000	1.7
@@ -95,7 +95,7 @@
   return 0;
 }
 
-uint32_t control(uint32_t request, void *data, ...)
+static uint32_t control(uint32_t request, void *data, ...)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:

Index: vo_odivx.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_odivx.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- vo_odivx.c	9 Feb 2002 00:47:26 -0000	1.10
+++ vo_odivx.c	9 Feb 2002 01:21:48 -0000	1.11
@@ -270,7 +270,7 @@
   return 0;
 }
 
-uint32_t control(uint32_t request, void *data, ...)
+static uint32_t control(uint32_t request, void *data, ...)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:

Index: vo_pgm.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_pgm.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- vo_pgm.c	9 Feb 2002 00:47:26 -0000	1.10
+++ vo_pgm.c	9 Feb 2002 01:21:48 -0000	1.11
@@ -140,7 +140,7 @@
   return 0;
 }
 
-uint32_t control(uint32_t request, void *data, ...)
+static uint32_t control(uint32_t request, void *data, ...)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:

Index: vo_png.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_png.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- vo_png.c	9 Feb 2002 00:47:26 -0000	1.12
+++ vo_png.c	9 Feb 2002 01:21:48 -0000	1.13
@@ -330,7 +330,7 @@
   return 0;
 }
 
-uint32_t control(uint32_t request, void *data, ...)
+static uint32_t control(uint32_t request, void *data, ...)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:

Index: vo_sdl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_sdl.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- vo_sdl.c	9 Feb 2002 00:47:26 -0000	1.66
+++ vo_sdl.c	9 Feb 2002 01:21:48 -0000	1.67
@@ -1326,7 +1326,7 @@
   return 0;
 }
 
-uint32_t control(uint32_t request, void *data, ...)
+static uint32_t control(uint32_t request, void *data, ...)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:

Index: vo_svga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_svga.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- vo_svga.c	9 Feb 2002 00:47:26 -0000	1.42
+++ vo_svga.c	9 Feb 2002 01:21:48 -0000	1.43
@@ -575,7 +575,7 @@
   return 0;
 }
 
-uint32_t control(uint32_t request, void *data, ...)
+static uint32_t control(uint32_t request, void *data, ...)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:

Index: vo_syncfb.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_syncfb.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- vo_syncfb.c	9 Feb 2002 00:47:26 -0000	1.10
+++ vo_syncfb.c	9 Feb 2002 01:21:48 -0000	1.11
@@ -453,7 +453,7 @@
   return 0;
 }
 
-uint32_t control(uint32_t request, void *data, ...)
+static uint32_t control(uint32_t request, void *data, ...)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:

Index: vo_tdfxfb.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_tdfxfb.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vo_tdfxfb.c	9 Feb 2002 00:47:26 -0000	1.6
+++ vo_tdfxfb.c	9 Feb 2002 01:21:48 -0000	1.7
@@ -828,7 +828,7 @@
   return 0;
 }
 
-uint32_t control(uint32_t request, void *data, ...)
+static uint32_t control(uint32_t request, void *data, ...)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:

Index: vo_vesa.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_vesa.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- vo_vesa.c	9 Feb 2002 00:47:26 -0000	1.66
+++ vo_vesa.c	9 Feb 2002 01:21:48 -0000	1.67
@@ -944,7 +944,7 @@
   return pre_init_err;
 }
 
-uint32_t control(uint32_t request, void *data, ...)
+static uint32_t control(uint32_t request, void *data, ...)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:

Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- vo_x11.c	9 Feb 2002 00:47:26 -0000	1.59
+++ vo_x11.c	9 Feb 2002 01:21:48 -0000	1.60
@@ -624,7 +624,7 @@
   return 0;
 }
 
-uint32_t control(uint32_t request, void *data, ...)
+static uint32_t control(uint32_t request, void *data, ...)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:

Index: vo_xmga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xmga.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- vo_xmga.c	9 Feb 2002 00:47:26 -0000	1.44
+++ vo_xmga.c	9 Feb 2002 01:21:48 -0000	1.45
@@ -400,7 +400,7 @@
   return 0;
 }
 
-uint32_t control(uint32_t request, void *data, ...)
+static uint32_t control(uint32_t request, void *data, ...)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:

Index: vo_xv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- vo_xv.c	9 Feb 2002 00:47:26 -0000	1.52
+++ vo_xv.c	9 Feb 2002 01:21:48 -0000	1.53
@@ -770,7 +770,7 @@
   vaa->set_video_eq = xv_set_video_eq;
 }
 
-uint32_t control(uint32_t request, void *data, ...)
+static uint32_t control(uint32_t request, void *data, ...)
 {
   switch (request) {
   case VOCTRL_QUERY_VAA:

Index: vo_xvidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xvidix.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- vo_xvidix.c	9 Feb 2002 00:47:26 -0000	1.19
+++ vo_xvidix.c	9 Feb 2002 01:21:48 -0000	1.20
@@ -463,7 +463,7 @@
     return(0);
 }
 
-uint32_t control(uint32_t request, void *data, ...)
+static uint32_t control(uint32_t request, void *data, ...)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:

Index: vo_zr.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_zr.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- vo_zr.c	9 Feb 2002 00:47:26 -0000	1.8
+++ vo_zr.c	9 Feb 2002 01:21:48 -0000	1.9
@@ -634,7 +634,7 @@
   return 0;
 }
 
-uint32_t control(uint32_t request, void *data, ...)
+static uint32_t control(uint32_t request, void *data, ...)
 {
   switch (request) {
   case VOCTRL_QUERY_FORMAT:




More information about the MPlayer-cvslog mailing list