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

flvdemux: add prefix to local GstIndex related copies

Browse source 
... to avoid duplicate type names with other such local copies in the wild.
This commit is contained in:
Mark Nauwelaerts 2012-01-12 11:08:38 +01:00
parent 68e0d2b60c
commit 559c800c4f
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gst/flv/gstindex.c
View file

@ -126,7 +126,7 @@ gst_index_resolver_get_type (void)
if (!index_resolver_type) { if (!index_resolver_type) {
index_resolver_type = index_resolver_type =
g_enum_register_static ("GstIndexResolver", index_resolver); g_enum_register_static ("GstFlvDemuxIndexResolver", index_resolver);
} }
return index_resolver_type; return index_resolver_type;
} }
@ -137,7 +137,7 @@ gst_index_entry_get_type (void)
static GType index_entry_type = 0; static GType index_entry_type = 0;
if (!index_entry_type) { if (!index_entry_type) {
index_entry_type = g_boxed_type_register_static ("GstIndexEntry", index_entry_type = g_boxed_type_register_static ("GstFlvDemuxIndexEntry",
(GBoxedCopyFunc) gst_index_entry_copy, (GBoxedCopyFunc) gst_index_entry_copy,
(GBoxedFreeFunc) gst_index_entry_free); (GBoxedFreeFunc) gst_index_entry_free);
} }
@ -152,7 +152,10 @@ gst_index_entry_get_type (void)
} }
#endif #endif
G_DEFINE_TYPE (GstIndex, gst_index, GST_TYPE_OBJECT); typedef GstIndex GstFlvDemuxIndex;
typedef GstIndexClass GstFlvDemuxIndexClass;
//typedef GstIndexEntry GstFlvDemuxIndexEntry;
G_DEFINE_TYPE (GstFlvDemuxIndex, gst_index, GST_TYPE_OBJECT);
static void static void
gst_index_class_init (GstIndexClass * klass) gst_index_class_init (GstIndexClass * klass)

4
gst/flv/gstmemindex.c
View file

@ -104,7 +104,9 @@ static GstIndexEntry *gst_mem_index_get_assoc_entry (GstIndex * index, gint id,
static GType gst_mem_index_get_type (void); static GType gst_mem_index_get_type (void);
G_DEFINE_TYPE (GstMemIndex, gst_mem_index, GST_TYPE_INDEX); typedef GstMemIndex GstFlvDemuxMemIndex;
typedef GstMemIndexClass GstFlvDemuxMemIndexClass;
G_DEFINE_TYPE (GstFlvDemuxMemIndex, gst_mem_index, GST_TYPE_INDEX);
static void static void
gst_mem_index_class_init (GstMemIndexClass * klass) gst_mem_index_class_init (GstMemIndexClass * klass)