diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-26 22:24:17 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-26 22:24:17 +0000 |
| commit | 1bf956391fc4bff66abea121f9088ee9c4b27794 (patch) | |
| tree | f98eea40df32baee603d37e70e8ef51ee8788852 /libvo | |
| parent | 461871fc5bf0bc57bafcba29f87e4dec2b621931 (diff) | |
| download | mpv-1bf956391fc4bff66abea121f9088ee9c4b27794.tar.bz2 mpv-1bf956391fc4bff66abea121f9088ee9c4b27794.tar.xz | |
MPlayer crash when using -wid and -vo x11 parameters.
I don't understand very well why my fix works.
Jouni Tulkki <jitulkki@cc.hut.fi>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9116 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_x11.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index a5e0dc311e..99094491d9 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -298,8 +298,7 @@ static uint32_t config( uint32_t width,uint32_t height,uint32_t d_width,uint32_t xswa.background_pixel=0; xswa.border_pixel=0; - xswa.colormap=theCmap; - xswamask=CWBackPixel | CWBorderPixel | CWColormap; + xswamask=CWBackPixel | CWBorderPixel; #ifdef HAVE_XF86VM if ( vm ) @@ -323,6 +322,8 @@ static uint32_t config( uint32_t width,uint32_t height,uint32_t d_width,uint32_t { if ( vo_window == None ) { + xswa.colormap=theCmap; + xswamask|=CWColormap; vo_window=XCreateWindow( mDisplay,mRootWin, vo_dx,vo_dy, vo_dwidth,vo_dheight, |