[Mplayer-cvslog] CVS: main/libvo vo_directfb.c,1.6,1.7

[Alex Beregszaszi]

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

Modified Files:
	vo_directfb.c 
Log Message:
fixed preinit conflict

Index: vo_directfb.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_directfb.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vo_directfb.c	26 Jan 2002 16:01:26 -0000	1.6
+++ vo_directfb.c	26 Jan 2002 16:31:14 -0000	1.7
@@ -235,7 +235,7 @@
      return DFENUM_OK;
 }
 
-static uint32_t preinit()
+static uint32_t preinit(const char *arg)
 {
      DFBSurfaceDescription dsc;
      DFBResult             ret;
@@ -357,7 +357,7 @@
 	}
 
 
-        if (!preinit()) return 1;
+        if (!preinit(NULL)) return 1;
 
 
   if (vm) {
@@ -598,7 +598,7 @@
 {
 	int ret = 0x4; /* osd/sub is supported on every bpp */
 
-        preinit();
+        preinit(NULL);
 
 //        printf("Format query: %s\n",vo_format_name(format));
 	switch (format) {
@@ -886,11 +886,6 @@
 //  dfb->Release (dfb);
 //  preinit_done=0;
 
-}
-
-static uint32_t preinit(const char *arg)
-{
-  return 0;
 }
 
 static void query_vaa(vo_vaa_t *vaa)