Mercurial > mplayer.hg

changeset 32380:c2370492acbc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix indentation.
author reimar
date Sat, 09 Oct 2010 13:31:03 +0000
parents 5471c2bb7a2b
children 2bd1aae2b3c6
files libvo/vo_dxr3.c
diffstat 1 files changed, 18 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_dxr3.c	Sat Oct 09 13:29:25 2010 +0000
+++ b/libvo/vo_dxr3.c	Sat Oct 09 13:31:03 2010 +0000
@@ -502,19 +502,19 @@
 		if (use_gui)
 			guiGetEvent(guiSetShVideo, 0);
 #endif
-			XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &xwin_attribs);
-			depth = xwin_attribs.depth;
-			if (depth != 15 && depth != 16 && depth != 24 && depth != 32) {
-				depth = 24;
-			}
-			XMatchVisualInfo(mDisplay, mScreen, depth, TrueColor, &vinfo);
-			vo_x11_create_vo_window(&vinfo, vo_dx, vo_dy,
-				d_width, d_height, flags,
-				CopyFromParent, "Viewing Window", title);
-			xswa.background_pixel = KEY_COLOR;
-			xswa.border_pixel = 0;
-			xswamask = CWBackPixel | CWBorderPixel;
-			XChangeWindowAttributes(mDisplay, vo_window, xswamask, &xswa);
+		XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &xwin_attribs);
+		depth = xwin_attribs.depth;
+		if (depth != 15 && depth != 16 && depth != 24 && depth != 32) {
+			depth = 24;
+		}
+		XMatchVisualInfo(mDisplay, mScreen, depth, TrueColor, &vinfo);
+		vo_x11_create_vo_window(&vinfo, vo_dx, vo_dy,
+			d_width, d_height, flags,
+			CopyFromParent, "Viewing Window", title);
+		xswa.background_pixel = KEY_COLOR;
+		xswa.border_pixel = 0;
+		xswamask = CWBackPixel | CWBorderPixel;
+		XChangeWindowAttributes(mDisplay, vo_window, xswamask, &xswa);
 
 		/* Start setting up overlay */
 		XGetWindowAttributes(mDisplay, mRootWin, &xwin_attribs);
@@ -696,7 +696,7 @@
 		overlay_set_mode(overlay_data, EM8300_OVERLAY_MODE_OFF);
 		overlay_release(overlay_data);
 
-			vo_x11_uninit();
+		vo_x11_uninit();
 	}
 #endif
 	if (old_vmode != -1) {
@@ -871,10 +871,10 @@
 
 		/* Initialize overlay and X11 */
 		overlay_data = overlay_init(fd_control);
-			if (!vo_init()) {
-				mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_DXR3_UnableToInitX11);
-				return -1;
-			}
+		if (!vo_init()) {
+			mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_DXR3_UnableToInitX11);
+			return -1;
+		}
 	}
 #endif