RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed preinit conflict 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4355 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
alex 2002-01-26 16:31:14 +00:00
parent c353730a98
commit 6232ad450b
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libvo/vo_directfb.c
View File

@ -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));