diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-09-18 18:46:12 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-09-18 18:46:12 +0000 |
| commit | bf52efc80477374c4f916a74f74007e2d44b4210 (patch) | |
| tree | 642042ad1c51b9482ece889cca0d4abbd61d4f39 /libvo | |
| parent | f5c7d8c92f3f6cd6afcf05fed157a82fe280cd19 (diff) | |
| download | mpv-bf52efc80477374c4f916a74f74007e2d44b4210.tar.bz2 mpv-bf52efc80477374c4f916a74f74007e2d44b4210.tar.xz | |
Re-add some ifdefs, partially reverting r29688, since mDisplay and
mScreen are undefined during a Windows build without X11 support.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29690 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_gl.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index 593964ee0c..aea5cf265c 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -435,8 +435,10 @@ static void uninitGl(void) { DeleteBuffers(2, gl_buffer_uv); gl_buffer_uv[0] = gl_buffer_uv[1] = 0; gl_buffersize_uv = 0; gl_bufferptr_uv[0] = gl_bufferptr_uv[1] = 0; +#ifdef CONFIG_X11 if (mesa_bufferptr) FreeMemoryMESA(mDisplay, mScreen, mesa_bufferptr); +#endif mesa_bufferptr = NULL; err_shown = 0; } @@ -773,6 +775,7 @@ static uint32_t get_image(mp_image_t *mpi) { mpi->stride[0] = mpi->width * mpi->bpp / 8; needed_size = mpi->stride[0] * mpi->height; if (mesa_buffer) { +#ifdef CONFIG_X11 if (mesa_bufferptr && needed_size > mesa_buffersize) { FreeMemoryMESA(mDisplay, mScreen, mesa_bufferptr); mesa_bufferptr = NULL; @@ -780,6 +783,7 @@ static uint32_t get_image(mp_image_t *mpi) { if (!mesa_bufferptr) mesa_bufferptr = AllocateMemoryMESA(mDisplay, mScreen, needed_size, 0, 0, 0); mesa_buffersize = needed_size; +#endif mpi->planes[0] = mesa_bufferptr; } else { if (!gl_buffer) |