From 7359989bdb60c61d32802c00a7c4cdb4362f96aa Mon Sep 17 00:00:00 2001
From: Edward Hervey <bilboed@bilboed.com>
Date: Tue, 9 Sep 2008 11:47:42 +0000
Subject: gst/mpegdemux/: Fix conflicting public names in new mpeg demuxers.

Original commit message from CVS:
* gst/mpegdemux/flumpegdemux.c: (plugin_init):
* gst/mpegdemux/gstmpegdemux.c: (gst_flups_demux_sync_get_type),
(gst_flups_demux_get_type), (gst_flups_demux_plugin_init):
* gst/mpegdemux/gstmpegtsdemux.c: (gst_fluts_demux_get_type),
(gst_fluts_demux_plugin_init):
Fix conflicting public names in new mpeg demuxers.
Fixes #550468
---
 ChangeLog | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 70081033..fbad3a9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-09-09  Edward Hervey  <edward.hervey@collabora.co.uk>
+
+	* gst/mpegdemux/flumpegdemux.c: (plugin_init):
+	* gst/mpegdemux/gstmpegdemux.c: (gst_flups_demux_sync_get_type),
+	(gst_flups_demux_get_type), (gst_flups_demux_plugin_init):
+	* gst/mpegdemux/gstmpegtsdemux.c: (gst_fluts_demux_get_type),
+	(gst_fluts_demux_plugin_init):
+	Fix conflicting public names in new mpeg demuxers.
+	Fixes #550468
+
 2008-09-08  Michael Smith <msmith@songbirdnest.com>
 
 	* gst/aiffparse/aiffparse.c:
-- 
cgit v1.2.1