summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libvo/vo_gl.c2
-rw-r--r--libvo/vo_gl2.c3
-rw-r--r--libvo/vo_xvidix.c2
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);