summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-09-03 13:18:26 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-09-03 13:18:26 +0000
commit7b9f20c0ab48e517963a97fa66e758751aa7c618 (patch)
tree84acbcc781c1dd410f5c3639c62d27a40dd0d7af /libvo
parente1e588421fc7e826d6bf65d838d3efb434827210 (diff)
downloadmpv-7b9f20c0ab48e517963a97fa66e758751aa7c618.tar.bz2
mpv-7b9f20c0ab48e517963a97fa66e758751aa7c618.tar.xz
Fix compilation after patch to remove global vo_hdc
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24335 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/gl_common.c4
-rw-r--r--libvo/vo_gl2.c2
-rw-r--r--libvo/w32_common.c4
3 files changed, 6 insertions, 4 deletions
diff --git a/libvo/gl_common.c b/libvo/gl_common.c
index 2c47189768..a123f582b9 100644
--- a/libvo/gl_common.c
+++ b/libvo/gl_common.c
@@ -1391,7 +1391,7 @@ int setGlWindow(int *vinfo, HGLRC *context, HWND win)
res = SET_WINDOW_OK;
out:
- ReleaseDC(windc);
+ ReleaseDC(win, windc);
return res;
}
@@ -1407,7 +1407,7 @@ void releaseGlContext(int *vinfo, HGLRC *context) {
void swapGlBuffers() {
HDC vo_hdc = GetDC(vo_w32_window);
SwapBuffers(vo_hdc);
- ReleaseDC(vo_hdc);
+ ReleaseDC(vo_w32_window, vo_hdc);
}
#else
#ifdef HAVE_LIBDL
diff --git a/libvo/vo_gl2.c b/libvo/vo_gl2.c
index 637cd6edab..173e999e21 100644
--- a/libvo/vo_gl2.c
+++ b/libvo/vo_gl2.c
@@ -101,6 +101,7 @@ static GLint getInternalFormat(void)
{
#ifdef GL_WIN32
PIXELFORMATDESCRIPTOR pfd;
+ HDC vo_hdc = GetDC(vo_window);
int pf = GetPixelFormat(vo_hdc);
if (!DescribePixelFormat(vo_hdc, pf, sizeof pfd, &pfd)) {
r_sz = g_sz = b_sz = a_sz = 0;
@@ -110,6 +111,7 @@ static GLint getInternalFormat(void)
b_sz = pfd.cBlueBits;
a_sz = pfd.cAlphaBits;
}
+ ReleaseDC(vo_window, vo_hdc);
#else
if (glXGetConfig(mDisplay, gl_vinfo, GLX_RED_SIZE, &r_sz) != 0) r_sz = 0;
if (glXGetConfig(mDisplay, gl_vinfo, GLX_GREEN_SIZE, &g_sz) != 0) g_sz = 0;
diff --git a/libvo/w32_common.c b/libvo/w32_common.c
index feafbe59df..9712d3af9d 100644
--- a/libvo/w32_common.c
+++ b/libvo/w32_common.c
@@ -308,7 +308,7 @@ static int createRenderingContext(void) {
pf = ChoosePixelFormat(vo_hdc, &pfd);
if (!pf) {
mp_msg(MSGT_VO, MSGL_ERR, "vo: win32: unable to select a valid pixel format!\n");
- ReleaseDC(vo_hdc);
+ ReleaseDC(vo_window, vo_hdc);
return 0;
}
@@ -316,7 +316,7 @@ static int createRenderingContext(void) {
mp_msg(MSGT_VO, MSGL_V, "vo: win32: running at %dx%d with depth %d\n", vo_screenwidth, vo_screenheight, vo_depthonscreen);
- ReleaseDC(vo_hdc);
+ ReleaseDC(vo_window, vo_hdc);
return 1;
}