diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-12-27 19:45:54 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-12-27 19:45:54 +0000 |
| commit | a5bd70e04fe3ec2089a2ec6930f165a43c68904b (patch) | |
| tree | b52e3042ab6ba58a59654876668fa85e942d78c4 /libvo/vo_x11.c | |
| parent | 81024b89f62904bb052b08b18decd59d95e09076 (diff) | |
| download | mpv-a5bd70e04fe3ec2089a2ec6930f165a43c68904b.tar.bz2 mpv-a5bd70e04fe3ec2089a2ec6930f165a43c68904b.tar.xz | |
just the same include reordering as in vo_xv (codemetics :)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11691 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_x11.c')
| -rw-r--r-- | libvo/vo_x11.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index 6203f783d7..ccf6434256 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -19,6 +19,21 @@ #include "x11_common.h" +#ifdef HAVE_SHM +#include <sys/ipc.h> +#include <sys/shm.h> +#include <X11/extensions/XShm.h> + +static int Shmem_Flag; +//static int Quiet_Flag; Here also what is this for. It's used but isn't inited ? +static XShmSegmentInfo Shminfo[1]; +static int gXErrorFlag; +static int CompletionType=-1; + +/* since it doesn't seem to be defined on some platforms */ +int XShmGetEventBase( Display* ); +#endif + #include "fastmemcpy.h" #include "sub.h" @@ -61,20 +76,6 @@ static int int_pause; static int Flip_Flag; static int zoomFlag; -#ifdef HAVE_SHM -#include <sys/ipc.h> -#include <sys/shm.h> -#include <X11/extensions/XShm.h> - -static int Shmem_Flag; -//static int Quiet_Flag; Here also what is this for. It's used but isn't inited ? -static XShmSegmentInfo Shminfo[1]; -static int gXErrorFlag; -static int CompletionType=-1; - -/* since it doesn't seem to be defined on some platforms */ -int XShmGetEventBase( Display* ); -#endif static uint32_t image_width; static uint32_t image_height; @@ -672,4 +673,3 @@ static uint32_t control(uint32_t request, void *data, ...) } return VO_NOTIMPL; } - |