Mercurial > mplayer.hg

changeset 7931:48c71b6c7389

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
vo_init() moved to/fixed in preinit()
author arpi
date Sun, 27 Oct 2002 03:16:21 +0000
parents a77aff3d7ac0
children 5cac037fcdd3
files libvo/vo_gl.c libvo/vo_gl2.c libvo/vo_xvidix.c
diffstat 3 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_gl.c	Sun Oct 27 03:15:48 2002 +0000
+++ b/libvo/vo_gl.c	Sun Oct 27 03:16:21 2002 +0000
@@ -428,7 +428,7 @@
 	return ENOSYS;
     }
 
-	if(!vo_init()) return 1;
+    if( !vo_init() ) return -1; // Can't open X11
 
     return 0;
 }
--- a/libvo/vo_gl2.c	Sun Oct 27 03:15:48 2002 +0000
+++ b/libvo/vo_gl2.c	Sun Oct 27 03:16:21 2002 +0000
@@ -622,8 +622,6 @@
 	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 @@
 	printf("[gl2] Unknown subdevice: %s\n",arg);
 	return ENOSYS;
     }
+    if( !vo_init() ) return -1; // Can't open X11
     return 0;
 }
 
--- a/libvo/vo_xvidix.c	Sun Oct 27 03:15:48 2002 +0000
+++ b/libvo/vo_xvidix.c	Sun Oct 27 03:16:21 2002 +0000
@@ -416,7 +416,7 @@
 	vidix_name = NULL;
     }
 
-    if (!vo_init()) return(1);
+    if (!vo_init()) return(-1);
 
     if (vidix_preinit(vidix_name, &video_out_xvidix) != 0)
 	return(1);