mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 00:36:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl: Move GstGLMixer to the plugin for now

Browse source 
It depends on GstAggregator and we don't want to install headers
for that yet.

https://bugzilla.gnome.org/show_bug.cgi?id=732207
This commit is contained in:
Sebastian Dröge 2014-07-11 09:41:05 +02:00
parent f701aa29b9
commit 92d00d0233
11 changed files with 7 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docs/libs/gst-plugins-bad-libs-docs.sgml
View file

@ -85,7 +85,6 @@
<xi:include href="xml/gstglfilter.xml"/>
<xi:include href="xml/gstglframebuffer.xml"/>
<xi:include href="xml/gstglmemory.xml"/>
<xi:include href="xml/gstglmixer.xml"/>
<xi:include href="xml/gstglshader.xml"/>
<xi:include href="xml/gstglupload.xml"/>
<xi:include href="xml/gstgluploadmeta.xml"/>

32
docs/libs/gst-plugins-bad-libs-sections.txt
View file

@ -1041,38 +1041,6 @@ GST_CAPS_FEATURE_MEMORY_EGL_IMAGE
<SUBSECTION Standard>
</SECTION>
<SECTION>
<FILE>gstglmixer</FILE>
GstGLMixerPad
GstGLMixerPadClass
GstGLMixerCollect
<TITLE>GstGLMixer</TITLE>
GstGLMixer
GstGLMixerClass
GstGLMixerProcessFunc
GstGLMixerSetCaps
GstGLMixerReset
GstGLMixerProcessTextures
GstGLMixerFrameData
gst_gl_mixer_process_textures
gst_gl_mixer_set_pad_type
<SUBSECTION Standard>
GstGLMixerPrivate
GST_GL_MIXER
GST_GL_MIXER_CLASS
GST_GL_MIXER_GET_CLASS
GST_GL_MIXER_PAD
GST_GL_MIXER_PAD_CLASS
gst_gl_mixer_get_type
gst_gl_mixer_pad_get_type
GST_IS_GL_MIXER
GST_IS_GL_MIXER_CLASS
GST_IS_GL_MIXER_PAD
GST_IS_GL_MIXER_PAD_CLASS
GST_TYPE_GL_MIXER
GST_TYPE_GL_MIXER_PAD
</SECTION>
<SECTION>
<FILE>gstglshader</FILE>
gst_gl_shader_error_quark

1
docs/libs/gst-plugins-bad-libs.types
View file

@ -33,7 +33,6 @@ gst_gl_display_get_type
gst_gl_context_get_type
gst_gl_filter_get_type
gst_gl_shader_get_type
gst_gl_mixer_get_type
gst_gl_buffer_pool_get_type
gst_gl_allocator_get_type
gst_gl_window_get_type

3
ext/gl/Makefile.am
View file

@ -25,6 +25,9 @@ OPENGL_SOURCES = \
gltestsrc.h \
gstgltestsrc.c \
gstgltestsrc.h \
gstglmixer.c \
gstglmixer.h \
gstglmixerpad.h \
gstglmosaic.c \
gstglmosaic.h \
effects/gstgleffectscurves.h \

0
gst-libs/gst/gl/gstglmixer.c → ext/gl/gstglmixer.c
View file

2
gst-libs/gst/gl/gstglmixer.h → ext/gl/gstglmixer.h
View file

@ -24,7 +24,7 @@
#include <gst/gst.h>
#include <gst/video/video.h>
#include <gst/gl/gl.h>
#include <gst/gl/gstglmixerpad.h>
#include "gstglmixerpad.h"
G_BEGIN_DECLS

0
gst-libs/gst/gl/gstglmixerpad.h → ext/gl/gstglmixerpad.h
View file

2
ext/gl/gstglmosaic.h
View file

@ -21,7 +21,7 @@
#ifndef _GST_GL_MOSAIC_H_
#define _GST_GL_MOSAIC_H_
#include <gst/gl/gstglmixer.h>
#include "gstglmixer.h"
G_BEGIN_DECLS

4
ext/gl/gstglvideomixer.h
View file

@ -21,8 +21,8 @@
#ifndef _GST_GL_VIDEO_MIXER_H_
#define _GST_GL_VIDEO_MIXER_H_
#include <gst/gl/gstglmixer.h>
#include <gst/gl/gstglmixerpad.h>
#include "gstglmixer.h"
#include "gstglmixerpad.h"
G_BEGIN_DECLS

3
gst-libs/gst/gl/Makefile.am
View file

@ -14,7 +14,6 @@ libgstgl_@GST_API_VERSION@_la_SOURCES = \
gstglmemory.c \
gstglbufferpool.c \
gstglfilter.c \
gstglmixer.c \
gstglshader.c \
gstglshadervariables.c \
gstglcolorconvert.c \
@ -35,8 +34,6 @@ libgstgl_@GST_API_VERSION@include_HEADERS = \
gstglmemory.h \
gstglbufferpool.h \
gstglfilter.h \
gstglmixer.h \
gstglmixerpad.h \
gstglshadervariables.h \
gstglshader.h \
gstglcolorconvert.h \

1
gst-libs/gst/gl/gl.h
View file

@ -43,7 +43,6 @@
#include <gst/gl/gstglbufferpool.h>
#include <gst/gl/gstglframebuffer.h>
#include <gst/gl/gstglfilter.h>
#include <gst/gl/gstglmixer.h>
#include <gst/gl/gstglshadervariables.h>
#endif /* __GST_GL_H__ */