diff options
| author | Matthew Waters <ystreet00@gmail.com> | 2013-08-21 14:05:56 +1000 |
|---|---|---|
| committer | Matthew Waters <ystreet00@gmail.com> | 2013-08-22 01:30:04 +1000 |
| commit | f8654c967c8e1dd5ae950589e01e26064d4f066e (patch) | |
| tree | 028d1ac620921561411f17c426e6d6019c883260 | |
| parent | 267a06813c43dfaa129c8d35213a7b682d39fc78 (diff) | |
move egl into its own directory
| -rw-r--r-- | gst-libs/gst/gl/Makefile.am | 4 | ||||
| -rw-r--r-- | gst-libs/gst/gl/android/gstglwindow_android_egl.h | 1 | ||||
| -rw-r--r-- | gst-libs/gst/gl/egl/gstglcontext_egl.c (renamed from gst-libs/gst/gl/gstglegl.c) | 6 | ||||
| -rw-r--r-- | gst-libs/gst/gl/egl/gstglcontext_egl.h (renamed from gst-libs/gst/gl/gstglegl.h) | 0 | ||||
| -rw-r--r-- | gst-libs/gst/gl/gstglcontext.c | 2 | ||||
| -rw-r--r-- | gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.h | 1 |
6 files changed, 6 insertions, 8 deletions
diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am index e9d60b8..09cb785 100644 --- a/gst-libs/gst/gl/Makefile.am +++ b/gst-libs/gst/gl/Makefile.am @@ -56,8 +56,8 @@ libgstgl_@GST_API_VERSION@_la_LIBADD += android/libgstgl-android.la endif if USE_EGL -libgstgl_@GST_API_VERSION@_la_SOURCES += gstglegl.c -noinst_HEADERS += gstglegl.h +libgstgl_@GST_API_VERSION@_la_SOURCES += egl/gstglcontext_egl.c +noinst_HEADERS += egl/gstglcontext_egl.h endif libgstgl_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/gl diff --git a/gst-libs/gst/gl/android/gstglwindow_android_egl.h b/gst-libs/gst/gl/android/gstglwindow_android_egl.h index d4cae36..e206685 100644 --- a/gst-libs/gst/gl/android/gstglwindow_android_egl.h +++ b/gst-libs/gst/gl/android/gstglwindow_android_egl.h @@ -25,7 +25,6 @@ #include <EGL/egl.h> #include <gst/gl/gl.h> -#include "../gstglegl.h" G_BEGIN_DECLS diff --git a/gst-libs/gst/gl/gstglegl.c b/gst-libs/gst/gl/egl/gstglcontext_egl.c index cb2cf1c..3ef5075 100644 --- a/gst-libs/gst/gl/gstglegl.c +++ b/gst-libs/gst/gl/egl/gstglcontext_egl.c @@ -22,14 +22,14 @@ #include "config.h" #endif -#include "gstglegl.h" +#include "gstglcontext_egl.h" #include <gst/gl/gl.h> #if GST_GL_HAVE_WINDOW_X11 -#include "x11/gstglwindow_x11.h" +#include "../x11/gstglwindow_x11.h" #endif #if GST_GL_HAVE_WINDOW_WIN32 -#include "win32/gstglwindow_win32.h" +#include "../win32/gstglwindow_win32.h" #endif static gboolean gst_gl_context_egl_create_context (GstGLContext * context, diff --git a/gst-libs/gst/gl/gstglegl.h b/gst-libs/gst/gl/egl/gstglcontext_egl.h index fcd2fe1..fcd2fe1 100644 --- a/gst-libs/gst/gl/gstglegl.h +++ b/gst-libs/gst/gl/egl/gstglcontext_egl.h diff --git a/gst-libs/gst/gl/gstglcontext.c b/gst-libs/gst/gl/gstglcontext.c index c8e233d..c2d20a7 100644 --- a/gst-libs/gst/gl/gstglcontext.c +++ b/gst-libs/gst/gl/gstglcontext.c @@ -31,7 +31,7 @@ #include "x11/gstglcontext_glx.h" #endif #if GST_GL_HAVE_PLATFORM_EGL -#include "gstglegl.h" +#include "egl/gstglcontext_egl.h" #endif #if GST_GL_HAVE_PLATFORM_COCOA #include "cocoa/gstglcontext_cocoa.h" diff --git a/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.h b/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.h index 32389e7..1cdd5e4 100644 --- a/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.h +++ b/gst-libs/gst/gl/wayland/gstglwindow_wayland_egl.h @@ -28,7 +28,6 @@ #include <EGL/egl.h> #include <gst/gl/gl.h> -#include "../gstglegl.h" G_BEGIN_DECLS |