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

Revert "vorbisdec: Fix GType name conflict if tremor and libvorbis decoder are used in the same process"

Browse source 
This reverts commit 858392f88a.

A similar, cleaner fix was already in place.
This commit is contained in:
Sebastian Dröge 2012-11-13 16:11:42 +01:00
parent 858392f88a
commit c09f503f72
2 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ext/vorbis/gstvorbisdec.c
View file

@ -69,8 +69,7 @@ GST_STATIC_PAD_TEMPLATE ("sink",
);
#define gst_vorbis_dec_parent_class parent_class
G_DEFINE_TYPE (GST_VORBIS_DEC_GLIB_TYPE_NAME, gst_vorbis_dec,
GST_TYPE_AUDIO_DECODER);
G_DEFINE_TYPE (GstVorbisDec, gst_vorbis_dec, GST_TYPE_AUDIO_DECODER);
static void vorbis_dec_finalize (GObject * object);

5
ext/vorbis/gstvorbisdeclib.h
View file

@ -43,8 +43,6 @@
#define GST_VORBIS_DEC_DEFAULT_SAMPLE_WIDTH (32)
#define GST_VORBIS_DEC_GLIB_TYPE_NAME GstVorbisDec
#else /* TREMOR */
#define GST_VORBIS_DEC_DESCRIPTION "decode raw vorbis streams to integer audio"
@ -61,9 +59,6 @@
#define GST_VORBIS_DEC_DEFAULT_SAMPLE_WIDTH (16)
/* we need a different type name here */
#define GST_VORBIS_DEC_GLIB_TYPE_NAME GstIVorbisDec
/* and still have it compile */
#define GstVorbisDec GstIVorbisDec
#define GstVorbisDecClass GstIVorbisDecClass