mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 09:40:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

[494/906] cmake build: use config.h from win32/common and add some guidelines

Browse source
This commit is contained in:
Julien Isorce 2012-04-17 18:25:55 +02:00 committed by Matthew Waters
parent 5b9e4b8282
commit 7e45f26a21
5 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gst-libs/gst/gl/gstglwindow_win32.c
View file

@ -181,8 +181,8 @@ gst_gl_window_new (DWORD_PTR external_gl_context)
g_debug ("gl window created: %lud\n", (gulong) priv->internal_win_id); g_debug ("gl window created: %lud\n", (gulong) priv->internal_win_id);
//device is set in the window_proc //device is set in the window_proc
if (!priv->display) { if (!priv->device) {
g_debug ("failed to create display\n"); g_debug ("failed to create device\n");
goto failure; goto failure;
} }
@ -191,7 +191,6 @@ gst_gl_window_new (DWORD_PTR external_gl_context)
return window; return window;
failure: failure:
g_mutex_unlock (priv->x_lock);
g_object_unref (G_OBJECT (window)); g_object_unref (G_OBJECT (window));
return NULL; return NULL;
} }

1
gst-libs/gst/gl/gstglwindow_winCE.c
View file

@ -195,7 +195,6 @@ gst_gl_window_new (gulong external_gl_context)
return window; return window;
failure: failure:
g_mutex_unlock (priv->x_lock);
g_object_unref (G_OBJECT (window)); g_object_unref (G_OBJECT (window));
return NULL; return NULL;
} }

5
gst/gl/CMakeLists.txt
View file

@ -8,7 +8,6 @@ include_directories(AFTER
../../gst-libs/gst/gl ../../gst-libs/gst/gl
${GLEW_INCLUDE_DIR} ${GLEW_INCLUDE_DIR}
../../gst-libs ../../gst-libs
../..
. .
effects) effects)
@ -19,7 +18,9 @@ include_directories(AFTER
endif (NOT GST_USING_BINARY_REGISTRY) endif (NOT GST_USING_BINARY_REGISTRY)
if (WIN32) if (WIN32)
include_directories(AFTER ../../win32/common) include_directories(AFTER
../../win32/common
../../../win32/common)
endif (WIN32) endif (WIN32)
add_library (gstopengl MODULE add_library (gstopengl MODULE

2
gst/gl/effects/gstgleffectssources.h
View file

@ -1,4 +1,4 @@
/* /*
* GStreamer * GStreamer
* Copyright (C) 2008 Filippo Argiolas <filippo.argiolas@gmail.com> * Copyright (C) 2008 Filippo Argiolas <filippo.argiolas@gmail.com>
* *

2
gst/gl/gstglupload.h
View file

@ -1,4 +1,4 @@
/* /*
* GStreamer * GStreamer
* Copyright (C) 2008 Julien Isorce <julien.isorce@gmail.com> * Copyright (C) 2008 Julien Isorce <julien.isorce@gmail.com>
* *