vo_init() moved to/fixed in preinit()

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7932 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2002-10-27 03:16:21 +00:00
parent 5a473a4ffc
commit 889ffa50ea
3 changed files with 3 additions and 4 deletions

View File

@ -428,7 +428,7 @@ static uint32_t preinit(const char *arg)
return ENOSYS;
}
if(!vo_init()) return 1;
if( !vo_init() ) return -1; // Can't open X11
return 0;
}

View File

@ -622,8 +622,6 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
image_width = width;
image_format = format;
if(!vo_init()) return -1;
aspect_save_orig(width,height);
aspect_save_prescale(d_width,d_height);
aspect_save_screenres(vo_screenwidth,vo_screenheight);
@ -1108,6 +1106,7 @@ static uint32_t preinit(const char *arg)
printf("[gl2] Unknown subdevice: %s\n",arg);
return ENOSYS;
}
if( !vo_init() ) return -1; // Can't open X11
return 0;
}

View File

@ -416,7 +416,7 @@ static uint32_t preinit(const char *arg)
vidix_name = NULL;
}
if (!vo_init()) return(1);
if (!vo_init()) return(-1);
if (vidix_preinit(vidix_name, &video_out_xvidix) != 0)
return(1);