Mercurial > mplayer.hg

comparison libvo/vo_x11.c @ 11690:860bc06f32ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
just the same include reordering as in vo_xv (codemetics :)
author alex
date Sat, 27 Dec 2003 19:45:54 +0000
parents 85e503ddf65f
children 162c80b2d432
comparison
equal deleted inserted replaced
11689:2b1649aaaf2a 11690:860bc06f32ca
16 #include <X11/extensions/xf86vmode.h> 16 #include <X11/extensions/xf86vmode.h>
17 #endif 17 #endif
18 #include <errno.h> 18 #include <errno.h>
19 19
20 #include "x11_common.h" 20 #include "x11_common.h"
21
22 #ifdef HAVE_SHM
23 #include <sys/ipc.h>
24 #include <sys/shm.h>
25 #include <X11/extensions/XShm.h>
26
27 static int Shmem_Flag;
28 //static int Quiet_Flag; Here also what is this for. It's used but isn't inited ?
29 static XShmSegmentInfo Shminfo[1];
30 static int gXErrorFlag;
31 static int CompletionType=-1;
32
33 /* since it doesn't seem to be defined on some platforms */
34 int XShmGetEventBase( Display* );
35 #endif
21 36
22 #include "fastmemcpy.h" 37 #include "fastmemcpy.h"
23 #include "sub.h" 38 #include "sub.h"
24 39
25 #include "../postproc/swscale.h" 40 #include "../postproc/swscale.h"
59 static int int_pause; 74 static int int_pause;
60 75
61 static int Flip_Flag; 76 static int Flip_Flag;
62 static int zoomFlag; 77 static int zoomFlag;
63 78
64 #ifdef HAVE_SHM
65 #include <sys/ipc.h>
66 #include <sys/shm.h>
67 #include <X11/extensions/XShm.h>
68
69 static int Shmem_Flag;
70 //static int Quiet_Flag; Here also what is this for. It's used but isn't inited ?
71 static XShmSegmentInfo Shminfo[1];
72 static int gXErrorFlag;
73 static int CompletionType=-1;
74
75 /* since it doesn't seem to be defined on some platforms */
76 int XShmGetEventBase( Display* );
77 #endif
78 79
79 static uint32_t image_width; 80 static uint32_t image_width;
80 static uint32_t image_height; 81 static uint32_t image_height;
81 static uint32_t in_format; 82 static uint32_t in_format;
82 static uint32_t out_format=0; 83 static uint32_t out_format=0;
670 } 671 }
671 return VO_TRUE; 672 return VO_TRUE;
672 } 673 }
673 return VO_NOTIMPL; 674 return VO_NOTIMPL;
674 } 675 }
675