diff options
| author | albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-23 01:38:06 +0000 |
|---|---|---|
| committer | albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-23 01:38:06 +0000 |
| commit | 64ae87b5e49f90321ccc3c17401d1695e9de9c1b (patch) | |
| tree | f910fa4b199351bcc7b29246fcad08506ef6923e /libvo/vo_x11.c | |
| parent | 3687495972a4dcb9b5b27d21a203a5212d6db2d2 (diff) | |
| download | mpv-64ae87b5e49f90321ccc3c17401d1695e9de9c1b.tar.bz2 mpv-64ae87b5e49f90321ccc3c17401d1695e9de9c1b.tar.xz | |
Bugfix in x11_common.c mainly. Don't screw up the display name,
don't forget to close the display (vo_xv) and to reset vo_depthonscreen
when we have destroyed the window and closed the display !!!!!
Open the display before using it (vo_x11) !!!
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4816 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_x11.c')
| -rw-r--r-- | libvo/vo_x11.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index 96578e36a7..986ce8d327 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -243,6 +243,12 @@ static uint32_t config( uint32_t width,uint32_t height,uint32_t d_width,uint32_t static uint32_t vm_height; #endif +#ifdef HAVE_NEW_GUI + if ( vo_window == None ) +#endif + if( !vo_init() ) return 0; // Can't open X11 + + if (!title) title = strdup("MPlayer X11 (XImage/Shm) render"); @@ -276,8 +282,6 @@ static uint32_t config( uint32_t width,uint32_t height,uint32_t d_width,uint32_t if ( vo_window == None ) #endif { - if( !vo_init() ) return 0; // Can't open X11 - hint.x=0; hint.y=0; if(zoomFlag){ @@ -524,7 +528,7 @@ static uint32_t draw_frame( uint8_t *src[] ){ static uint32_t query_format( uint32_t format ) { - if( !vo_init() ) return 0; // Can't open X11 + //if( !vo_init() ) return 0; // Can't open X11 switch( format ) { |