From 6232ad450b1c7281f0b658dae1524ea3ef6a1310 Mon Sep 17 00:00:00 2001 From: alex Date: Sat, 26 Jan 2002 16:31:14 +0000 Subject: fixed preinit conflict git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4355 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vo_directfb.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/libvo/vo_directfb.c b/libvo/vo_directfb.c index be605c8bb4..618e34e0b2 100644 --- a/libvo/vo_directfb.c +++ b/libvo/vo_directfb.c @@ -235,7 +235,7 @@ DFBEnumerationResult enum_layers_callback( unsigned int id, return DFENUM_OK; } -static uint32_t preinit() +static uint32_t preinit(const char *arg) { DFBSurfaceDescription dsc; DFBResult ret; @@ -357,7 +357,7 @@ static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width, } - if (!preinit()) return 1; + if (!preinit(NULL)) return 1; if (vm) { @@ -598,7 +598,7 @@ static uint32_t query_format(uint32_t format) { 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 void uninit(void) } -static uint32_t preinit(const char *arg) -{ - return 0; -} - static void query_vaa(vo_vaa_t *vaa) { memset(vaa,0,sizeof(vo_vaa_t)); -- cgit v1.2.3