[Mplayer-cvslog] CVS: main/libvo vo_xmga.c,1.48,1.49 vo_mga.c,1.26,1.27 mga_common.c,1.17,1.18

[Arpi of Ize]

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

Modified Files:
	vo_xmga.c vo_mga.c mga_common.c 
Log Message:
control+preinit moved to mga_common.c

Index: vo_xmga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xmga.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- vo_xmga.c	21 Feb 2002 21:11:01 -0000	1.48
+++ vo_xmga.c	7 Mar 2002 01:51:28 -0000	1.49
@@ -373,16 +373,3 @@
  printf("vo: uninit!\n");
 }
 
-static uint32_t preinit(const char *arg)
-{
-  return 0;
-}
-
-static uint32_t control(uint32_t request, void *data, ...)
-{
-  switch (request) {
-  case VOCTRL_QUERY_FORMAT:
-    return query_format(*((uint32_t*)data));
-  }
-  return VO_NOTIMPL;
-}

Index: vo_mga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_mga.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- vo_mga.c	6 Mar 2002 15:00:38 -0000	1.26
+++ vo_mga.c	7 Mar 2002 01:51:28 -0000	1.27
@@ -169,16 +169,3 @@
 {
 }
 
-static uint32_t preinit(const char *arg)
-{
-  return 0;
-}
-
-static uint32_t control(uint32_t request, void *data, ...)
-{
-  switch (request) {
-  case VOCTRL_QUERY_FORMAT:
-    return query_format(*((uint32_t*)data));
-  }
-  return VO_NOTIMPL;
-}

Index: mga_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/mga_common.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mga_common.c	6 Mar 2002 15:48:54 -0000	1.17
+++ mga_common.c	7 Mar 2002 01:51:28 -0000	1.18
@@ -200,6 +200,16 @@
     return 0;
 }
 
+static uint32_t control(uint32_t request, void *data, ...)
+{
+  switch (request) {
+  case VOCTRL_QUERY_FORMAT:
+    return query_format(*((uint32_t*)data));
+  }
+  return VO_NOTIMPL;
+}
+
+
 static int mga_init(){
 	char *frame_mem;
 
@@ -232,3 +242,9 @@
 	munmap(frames[0],mga_vid_config.frame_size*mga_vid_config.num_frames);
 	close(f);
 }
+
+static uint32_t preinit(const char *arg)
+{
+  return 0;
+}
+