Mercurial > mplayer.hg

changeset 4354:5018e8014ebd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed preinit conflict
author alex
date Sat, 26 Jan 2002 16:31:14 +0000
parents 8487ae6ca3f4
children 4167864cfb0a
files libvo/vo_directfb.c
diffstat 1 files changed, 3 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_directfb.c	Sat Jan 26 16:30:43 2002 +0000
+++ b/libvo/vo_directfb.c	Sat Jan 26 16:31:14 2002 +0000
@@ -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) {
@@ -888,11 +888,6 @@
 
 }
 
-static uint32_t preinit(const char *arg)
-{
-  return 0;
-}
-
 static void query_vaa(vo_vaa_t *vaa)
 {
   memset(vaa,0,sizeof(vo_vaa_t));