Mercurial > mplayer.hg
changeset 29646:11b5e67d05a3
Get rid of several (probably) pointless ifdefs
| author | reimar |
|---|---|
| date | Fri, 18 Sep 2009 16:51:19 +0000 |
| parents | 7eb282a13214 |
| children | e788d48bf768 |
| files | libvo/vo_gl.c |
| diffstat | 1 files changed, 0 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/vo_gl.c Thu Sep 17 19:03:31 2009 +0000 +++ b/libvo/vo_gl.c Fri Sep 18 16:51:19 2009 +0000 @@ -435,10 +435,8 @@ 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; -#ifndef GL_WIN32 if (mesa_bufferptr) FreeMemoryMESA(mDisplay, mScreen, mesa_bufferptr); -#endif mesa_bufferptr = NULL; err_shown = 0; } @@ -545,9 +543,7 @@ if (use_gui) { // GUI creates and manages window for us guiGetEvent(guiSetShVideo, 0); -#ifndef GL_WIN32 goto glconfig; -#endif } #endif #ifdef GL_WIN32 @@ -777,7 +773,6 @@ mpi->stride[0] = mpi->width * mpi->bpp / 8; needed_size = mpi->stride[0] * mpi->height; if (mesa_buffer) { -#ifndef GL_WIN32 if (mesa_bufferptr && needed_size > mesa_buffersize) { FreeMemoryMESA(mDisplay, mScreen, mesa_bufferptr); mesa_bufferptr = NULL; @@ -785,7 +780,6 @@ 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)