ext/ogg/gstoggdemux.c: Don't add pads and activate them for skeleton streams. These are already handled inside oggdem...

Original commit message from CVS:
Patch by: Alessandro Dessina <alessandro nnva org>
* ext/ogg/gstoggdemux.c: (gst_ogg_demux_deactivate_current_chain),
(gst_ogg_demux_activate_chain):
Don't add pads and activate them for skeleton streams. These are already
handled inside oggdemux. Fixes bug #537599.
This commit is contained in:
Alessandro Dessina 2008-08-23 15:19:59 +00:00 committed by Sebastian Dröge
parent 096e77929f
commit 4f9bfa6a03
2 changed files with 16 additions and 0 deletions

View file

@ -1,3 +1,12 @@
2008-08-23 Sebastian Dröge <sebastian.droege@collabora.co.uk>
Patch by: Alessandro Dessina <alessandro nnva org>
* ext/ogg/gstoggdemux.c: (gst_ogg_demux_deactivate_current_chain),
(gst_ogg_demux_activate_chain):
Don't add pads and activate them for skeleton streams. These are already
handled inside oggdemux. Fixes bug #537599.
2008-08-22 Wim Taymans <wim.taymans@collabora.co.uk>
* ext/vorbis/vorbisdec.c: (vorbis_dec_change_state):

View file

@ -1746,6 +1746,9 @@ gst_ogg_demux_deactivate_current_chain (GstOggDemux * ogg)
for (i = 0; i < chain->streams->len; i++) {
GstOggPad *pad = g_array_index (chain->streams, GstOggPad *, i);
if (pad->is_skeleton)
continue;
gst_pad_push_event (GST_PAD_CAST (pad), gst_event_new_eos ());
GST_DEBUG_OBJECT (ogg, "removing pad %" GST_PTR_FORMAT, pad);
@ -1786,6 +1789,10 @@ gst_ogg_demux_activate_chain (GstOggDemux * ogg, GstOggChain * chain,
GstOggPad *pad;
pad = g_array_index (chain->streams, GstOggPad *, i);
if (pad->is_skeleton)
continue;
GST_DEBUG_OBJECT (ogg, "adding pad %" GST_PTR_FORMAT, pad);
/* mark discont */