mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 06:46:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

glmixer: fix some compiler warnings

Browse source 
i686-apple-darwin11-llvm-gcc-4.2

gstglmixer.h:43: error: redefinition of typedef ‘GstGLMixer’
gstglmixerpad.h:32: error: previous declaration of ‘GstGLMixer’ was here
gstglmixer.h:46: error: redefinition of typedef ‘GstGLMixerFrameData’
gstglmixerpad.h:33: error: previous declaration of ‘GstGLMixerFrameData’ was here
This commit is contained in:
Julien Isorce 2015-02-17 23:50:51 +00:00 committed by Tim-Philipp Müller
parent 50ae80e0e6
commit 975df8b648
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ext/gl/gstglmixerpad.h
View file

@ -29,8 +29,8 @@
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _GstGLMixer GstGLMixer; struct _GstGLMixer;
typedef struct _GstGLMixerFrameData GstGLMixerFrameData; struct _GstGLMixerFrameData;
#define GST_TYPE_GL_MIXER_PAD (gst_gl_mixer_pad_get_type()) #define GST_TYPE_GL_MIXER_PAD (gst_gl_mixer_pad_get_type())
#define GST_GL_MIXER_PAD(obj) \ #define GST_GL_MIXER_PAD(obj) \
@ -62,7 +62,7 @@ struct _GstGLMixerPadClass
{ {
GstVideoAggregatorPadClass parent_class; GstVideoAggregatorPadClass parent_class;
GstBuffer * (*upload_buffer) (GstGLMixer * mix, GstGLMixerFrameData * frame, GstBuffer * buffer); GstBuffer * (*upload_buffer) (struct _GstGLMixer * mix, struct _GstGLMixerFrameData * frame, GstBuffer * buffer);
}; };
GType gst_gl_mixer_pad_get_type (void); GType gst_gl_mixer_pad_get_type (void);