Mercurial > mplayer.hg
changeset 29648:74f94f407c31
Re-add some ifdefs, partially reverting r29688, since mDisplay and
mScreen are undefined during a Windows build without X11 support.
| author | reimar |
|---|---|
| date | Fri, 18 Sep 2009 18:46:12 +0000 |
| parents | e788d48bf768 |
| children | d1461d932ad2 |
| files | libvo/vo_gl.c |
| diffstat | 1 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/vo_gl.c Fri Sep 18 18:25:17 2009 +0000 +++ b/libvo/vo_gl.c Fri Sep 18 18:46:12 2009 +0000 @@ -435,8 +435,10 @@ 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 @@ 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 @@ 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)