mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-25 23:46:45 +00:00
fix ogm[audio/video]parse plugin registration (riff won't load if bytestream is already loaded)
Original commit message from CVS: fix ogm[audio/video]parse plugin registration (riff won't load if bytestream is already loaded)
This commit is contained in:
parent
c1e1206414
commit
627ff3b293
3 changed files with 11 additions and 5 deletions
|
@ -1,3 +1,10 @@
|
||||||
|
2004-12-26 Stephane Loeuillet <stephane.loeuillet@tiscali.fr>
|
||||||
|
|
||||||
|
* ext/ogg/gstogg.c:
|
||||||
|
* ext/ogg/gstogmparse.c:
|
||||||
|
fix ogm[audio/video]parse plugin registration
|
||||||
|
(riff won't load if bytestream is already loaded)
|
||||||
|
|
||||||
2004-12-24 Thomas Vander Stichele <thomas at apestaart dot org>
|
2004-12-24 Thomas Vander Stichele <thomas at apestaart dot org>
|
||||||
|
|
||||||
* gst/audioconvert/gstchannelmix.c:
|
* gst/audioconvert/gstchannelmix.c:
|
||||||
|
|
|
@ -32,7 +32,7 @@ GST_DEBUG_CATEGORY (vorbisdec_debug);
|
||||||
static gboolean
|
static gboolean
|
||||||
plugin_init (GstPlugin * plugin)
|
plugin_init (GstPlugin * plugin)
|
||||||
{
|
{
|
||||||
if (!gst_library_load ("gstbytestream"))
|
if (!gst_library_load ("riff"))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
gst_ogg_demux_plugin_init (plugin);
|
gst_ogg_demux_plugin_init (plugin);
|
||||||
|
|
|
@ -547,9 +547,8 @@ gst_ogm_parse_plugin_init (GstPlugin * plugin)
|
||||||
{
|
{
|
||||||
GST_DEBUG_CATEGORY_INIT (gst_ogm_parse_debug, "ogmparse", 0, "ogm parser");
|
GST_DEBUG_CATEGORY_INIT (gst_ogm_parse_debug, "ogmparse", 0, "ogm parser");
|
||||||
|
|
||||||
return gst_library_load ("riff") &&
|
return gst_element_register (plugin, "ogmaudioparse", GST_RANK_PRIMARY,
|
||||||
gst_element_register (plugin, "ogmaudioparse", GST_RANK_PRIMARY,
|
GST_TYPE_OGM_AUDIO_PARSE)
|
||||||
GST_TYPE_OGM_AUDIO_PARSE) &&
|
&& gst_element_register (plugin, "ogmvideoparse", GST_RANK_PRIMARY,
|
||||||
gst_element_register (plugin, "ogmvideoparse", GST_RANK_PRIMARY,
|
|
||||||
GST_TYPE_OGM_VIDEO_PARSE);
|
GST_TYPE_OGM_VIDEO_PARSE);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue