diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-10-09 13:31:03 +0000 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-02 04:18:09 +0200 |
| commit | 26108aa19a86130436fc78866ecb465128b2b210 (patch) | |
| tree | cd13ff00baea5834c6c858104c48ebb5951c1c2f | |
| parent | ffb69180bb9a0ff4edc6abb6ce29d37a775453b2 (diff) | |
| download | mpv-26108aa19a86130436fc78866ecb465128b2b210.tar.bz2 mpv-26108aa19a86130436fc78866ecb465128b2b210.tar.xz | |
vo_dxr3: Fix indentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32466 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libvo/vo_dxr3.c | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c index 240d369f83..41e1dcfd4e 100644 --- a/libvo/vo_dxr3.c +++ b/libvo/vo_dxr3.c @@ -477,21 +477,19 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_ vo_dy = (vo_screenheight - d_height) / 2; vo_dwidth = d_width; vo_dheight = d_height; - { - 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); @@ -675,8 +673,7 @@ static void uninit(void) overlay_set_mode(overlay_data, EM8300_OVERLAY_MODE_OFF); overlay_release(overlay_data); - vo_x11_uninit(); - + vo_x11_uninit(); } #endif if (old_vmode != -1) { @@ -851,10 +848,10 @@ static int preinit(const char *arg) /* Initialize overlay and X11 */ overlay_data = overlay_init(fd_control); - if (!vo_init()) { - mp_tmsg(MSGT_VO,MSGL_ERR, "[VO_DXR3] Unable to init X11!\n"); - return -1; - } + if (!vo_init()) { + mp_tmsg(MSGT_VO,MSGL_ERR, "[VO_DXR3] Unable to init X11!\n"); + return -1; + } } #endif |