diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-19 15:51:17 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-19 15:51:17 +0000 |
| commit | 2d2c807b6d2d90bd6e256f2860e98f919b3795c1 (patch) | |
| tree | 4c74287bfecdb41a53cce08408e4aba734e41064 /libvo | |
| parent | 59ff0c977904714809cda249500419c4104d88ed (diff) | |
| download | mpv-2d2c807b6d2d90bd6e256f2860e98f919b3795c1.tar.bz2 mpv-2d2c807b6d2d90bd6e256f2860e98f919b3795c1.tar.xz | |
changed SH_MEM to HAVE_SHM according to configure
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3004 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_x11.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index f541e0120a..04a34430b5 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -76,9 +76,7 @@ static int X_already_started=0; static int Flip_Flag; -#define SH_MEM - -#ifdef SH_MEM +#ifdef HAVE_SHM #include <sys/ipc.h> #include <sys/shm.h> @@ -314,7 +312,7 @@ static uint32_t init( uint32_t width,uint32_t height,uint32_t d_width,uint32_t d #endif } -#ifdef SH_MEM +#ifdef HAVE_SHM if ( mLocalDisplay && XShmQueryExtension( mDisplay ) ) Shmem_Flag=1; else { @@ -385,7 +383,7 @@ static uint32_t init( uint32_t width,uint32_t height,uint32_t d_width,uint32_t d myximage=XGetImage( mDisplay,mywindow,0,0, image_width,image_height,AllPlanes,ZPixmap ); ImageData=myximage->data; -#ifdef SH_MEM +#ifdef HAVE_SHM } DeInstallXErrorHandler(); @@ -437,7 +435,7 @@ static const vo_info_t* get_info( void ) static void Terminate_Display_Process( void ) { getchar(); /* wait for enter to remove window */ -#ifdef SH_MEM +#ifdef HAVE_SHM if ( Shmem_Flag ) { XShmDetach( mDisplay,&Shminfo[0] ); @@ -453,7 +451,7 @@ static void Terminate_Display_Process( void ) static void Display_Image( XImage *myximage,uint8_t *ImageData ) { #ifdef DISP -#ifdef SH_MEM +#ifdef HAVE_SHM if ( Shmem_Flag ) { XShmPutImage( mDisplay,mywindow,mygc,myximage, |