summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-05-08 21:49:52 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-08-29 21:01:55 +0300
commit3013f956dcb136a999cd474440ff3fdefaf631e9 (patch)
tree21659305e4dd27dd02d390e64c3d0c02080a21dd /libvo
parentfa860a7ffa80ebdd1361971780ea01d85746c01f (diff)
downloadmpv-3013f956dcb136a999cd474440ff3fdefaf631e9.tar.bz2
mpv-3013f956dcb136a999cd474440ff3fdefaf631e9.tar.xz
vo_vdpau: reindent after GUI code removal
Diffstat (limited to 'libvo')
-rw-r--r--libvo/vo_vdpau.c58
1 files changed, 28 insertions, 30 deletions
diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c
index 5264a4d7ee..82a0a23d9f 100644
--- a/libvo/vo_vdpau.c
+++ b/libvo/vo_vdpau.c
@@ -504,41 +504,39 @@ static int config(struct vo *vo, uint32_t width, uint32_t height,
vc->visible_buf = false;
- {
#ifdef CONFIG_XF86VM
- if (vm) {
- vo_vm_switch(vo);
- vc->mode_switched = true;
- }
+ if (vm) {
+ vo_vm_switch(vo);
+ vc->mode_switched = true;
+ }
#endif
- XGetWindowAttributes(x11->display, DefaultRootWindow(x11->display),
- &attribs);
- depth = attribs.depth;
- if (depth != 15 && depth != 16 && depth != 24 && depth != 32)
- depth = 24;
- XMatchVisualInfo(x11->display, x11->screen, depth, TrueColor, &vinfo);
-
- xswa.background_pixel = 0;
- xswa.border_pixel = 0;
- /* Do not use CWBackPixel: It leads to VDPAU errors after
- aspect ratio changes. */
- xswamask = CWBorderPixel;
-
- vo_x11_create_vo_window(vo, &vinfo, vo->dx, vo->dy, d_width, d_height,
- flags, CopyFromParent, "vdpau", title);
- XChangeWindowAttributes(x11->display, x11->window, xswamask, &xswa);
+ XGetWindowAttributes(x11->display, DefaultRootWindow(x11->display),
+ &attribs);
+ depth = attribs.depth;
+ if (depth != 15 && depth != 16 && depth != 24 && depth != 32)
+ depth = 24;
+ XMatchVisualInfo(x11->display, x11->screen, depth, TrueColor, &vinfo);
+
+ xswa.background_pixel = 0;
+ xswa.border_pixel = 0;
+ /* Do not use CWBackPixel: It leads to VDPAU errors after
+ * aspect ratio changes. */
+ xswamask = CWBorderPixel;
+
+ vo_x11_create_vo_window(vo, &vinfo, vo->dx, vo->dy, d_width, d_height,
+ flags, CopyFromParent, "vdpau", title);
+ XChangeWindowAttributes(x11->display, x11->window, xswamask, &xswa);
#ifdef CONFIG_XF86VM
- if (vm) {
- /* Grab the mouse pointer in our window */
- if (vo_grabpointer)
- XGrabPointer(x11->display, x11->window, True, 0,
- GrabModeAsync, GrabModeAsync,
- x11->window, None, CurrentTime);
- XSetInputFocus(x11->display, x11->window, RevertToNone, CurrentTime);
- }
-#endif
+ if (vm) {
+ /* Grab the mouse pointer in our window */
+ if (vo_grabpointer)
+ XGrabPointer(x11->display, x11->window, True, 0,
+ GrabModeAsync, GrabModeAsync,
+ x11->window, None, CurrentTime);
+ XSetInputFocus(x11->display, x11->window, RevertToNone, CurrentTime);
}
+#endif
if ((flags & VOFLAG_FULLSCREEN) && WinID <= 0)
vo_fs = 1;