From e9a2613c66acae8dfc8eab5c176b7ff0ae68fc6f Mon Sep 17 00:00:00 2001 From: Julien Isorce Date: Mon, 31 Aug 2009 17:26:34 +0200 Subject: [PATCH] [373/906] sdlshare example: review includes order and fix closure --- tests/examples/sdl/sdlshare.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/tests/examples/sdl/sdlshare.c b/tests/examples/sdl/sdlshare.c index 4749f2ad00..c12a91b4a0 100644 --- a/tests/examples/sdl/sdlshare.c +++ b/tests/examples/sdl/sdlshare.c @@ -18,22 +18,20 @@ * Boston, MA 02111-1307, USA. */ -#include - -#ifdef WIN32 -#define WIN32_LEAN_AND_MEAN -#include -#include "SDL.h" -#include "SDL_opengl.h" -#endif -#ifndef WIN32 -#include +#include +#include #include "SDL/SDL.h" #include "SDL/SDL_opengl.h" + +#ifdef WIN32 +#include +#else +#include #include "SDL/SDL_syswm.h" #endif -#include // Header File For The OpenGL32 Library -#include // Header File For The GLu32 Library + +#include + /* hack */ typedef struct _GstGLBuffer GstGLBuffer; @@ -347,8 +345,7 @@ main (int argc, char **argv) #ifdef WIN32 wglMakeCurrent (0, 0); #else - g_print ("no yet implemented if not win32\n"); - return -1; + glXMakeCurrent (sdl_display, sdl_win, sdl_gl_context); #endif gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_NULL);