mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-20 23:36:38 +00:00
[373/906] sdlshare example: review includes order and fix closure
This commit is contained in:
parent
785e001a1a
commit
e9a2613c66
1 changed files with 11 additions and 14 deletions
|
@ -18,22 +18,20 @@
|
||||||
* Boston, MA 02111-1307, USA.
|
* Boston, MA 02111-1307, USA.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <gst/gst.h>
|
#include <GL/gl.h>
|
||||||
|
#include <GL/glu.h>
|
||||||
#ifdef WIN32
|
|
||||||
#define WIN32_LEAN_AND_MEAN
|
|
||||||
#include <windows.h>
|
|
||||||
#include "SDL.h"
|
|
||||||
#include "SDL_opengl.h"
|
|
||||||
#endif
|
|
||||||
#ifndef WIN32
|
|
||||||
#include <GL/glx.h>
|
|
||||||
#include "SDL/SDL.h"
|
#include "SDL/SDL.h"
|
||||||
#include "SDL/SDL_opengl.h"
|
#include "SDL/SDL_opengl.h"
|
||||||
|
|
||||||
|
#ifdef WIN32
|
||||||
|
#include <windows.h>
|
||||||
|
#else
|
||||||
|
#include <GL/glx.h>
|
||||||
#include "SDL/SDL_syswm.h"
|
#include "SDL/SDL_syswm.h"
|
||||||
#endif
|
#endif
|
||||||
#include <GL/gl.h> // Header File For The OpenGL32 Library
|
|
||||||
#include <GL/glu.h> // Header File For The GLu32 Library
|
#include <gst/gst.h>
|
||||||
|
|
||||||
|
|
||||||
/* hack */
|
/* hack */
|
||||||
typedef struct _GstGLBuffer GstGLBuffer;
|
typedef struct _GstGLBuffer GstGLBuffer;
|
||||||
|
@ -347,8 +345,7 @@ main (int argc, char **argv)
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
wglMakeCurrent (0, 0);
|
wglMakeCurrent (0, 0);
|
||||||
#else
|
#else
|
||||||
g_print ("no yet implemented if not win32\n");
|
glXMakeCurrent (sdl_display, sdl_win, sdl_gl_context);
|
||||||
return -1;
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_NULL);
|
gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_NULL);
|
||||||
|
|
Loading…
Reference in a new issue