RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '20e82b41fcad23ebbb18d89948aebfcc53921198' 

* commit '20e82b41fcad23ebbb18d89948aebfcc53921198':
  x11grab: Small near-cosmetic refactorings

Conflicts:
	libavdevice/x11grab.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-28 21:39:19 +02:00
parent 5393c9dadd 20e82b41fc
commit 65c9e2d003
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libavdevice/x11grab.c
View File

@ -99,11 +99,9 @@ static void x11grab_draw_region_win(struct x11grab *s)
{
Display *dpy = s->dpy;
Window win = s->region_win;
int screen;
GC gc;
int screen = DefaultScreen(dpy);
GC gc = XCreateGC(dpy, win, 0, 0);
screen = DefaultScreen(dpy);
gc = XCreateGC(dpy, win, 0, 0);
XSetForeground(dpy, gc, WhitePixel(dpy, screen));
XSetBackground(dpy, gc, BlackPixel(dpy, screen));
XSetLineAttributes(dpy, gc, REGION_WIN_BORDER, LineDoubleDash, 0, 0);
@ -121,12 +119,10 @@ static void x11grab_draw_region_win(struct x11grab *s)
static void x11grab_region_win_init(struct x11grab *s)
{
Display *dpy = s->dpy;
int screen;
XSetWindowAttributes attribs;
XRectangle rect;
XSetWindowAttributes attribs = { .override_redirect = True };
int screen = DefaultScreen(dpy);
screen = DefaultScreen(dpy);
attribs.override_redirect = True;
s->region_win = XCreateWindow(dpy, RootWindow(dpy, screen),
s->x_off - REGION_WIN_BORDER,
s->y_off - REGION_WIN_BORDER,
@ -164,12 +160,8 @@ static int x11grab_read_header(AVFormatContext *s1)
AVStream *st = NULL;
enum AVPixelFormat input_pixfmt;
XImage *image;
int x_off = 0;
int y_off = 0;
int screen;
int use_shm = 0;
int x_off = 0, y_off = 0, ret = 0, screen, use_shm = 0;
char *dpyname, *offset;
int ret = 0;
Colormap color_map;
XColor color[256];
int i;
@ -578,10 +570,10 @@ static int x11grab_read_packet(AVFormatContext *s1, AVPacket *pkt)
if (s->show_region) {
if (s->region_win) {
XEvent evt;
// clean up the events, and do the initinal draw or redraw.
for (evt.type = NoEventMask;
XCheckMaskEvent(dpy, ExposureMask | StructureNotifyMask, &evt);)
XEvent evt = { .type = NoEventMask };
// Clean up the events, and do the initial draw or redraw.
while (XCheckMaskEvent(dpy, ExposureMask | StructureNotifyMask,
&evt))
;
if (evt.type)
x11grab_draw_region_win(s);