diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-27 03:16:21 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-27 03:16:21 +0000 |
| commit | 889ffa50eae0dfb37e76eff386931c89c97f937c (patch) | |
| tree | 36c9b8e64a176eefd3e8ae776d4c1351214639f0 /libvo | |
| parent | 5a473a4ffcae319ea5ab0c2ce28060ce856e683f (diff) | |
| download | mpv-889ffa50eae0dfb37e76eff386931c89c97f937c.tar.bz2 mpv-889ffa50eae0dfb37e76eff386931c89c97f937c.tar.xz | |
vo_init() moved to/fixed in preinit()
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7932 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_gl.c | 2 | ||||
| -rw-r--r-- | libvo/vo_gl2.c | 3 | ||||
| -rw-r--r-- | libvo/vo_xvidix.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index 4cf7811313..a05bbee9d5 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -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; } diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c index 5a2b155a3a..12e8e27881 100644 --- a/libvo/vo_gl2.c +++ b/libvo/vo_gl2.c @@ -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; } diff --git a/libvo/vo_xvidix.c b/libvo/vo_xvidix.c index 655feafb79..19fd6e1981 100644 --- a/libvo/vo_xvidix.c +++ b/libvo/vo_xvidix.c @@ -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); |