From: Alessandro Dessina Date: Sat, 23 Aug 2008 15:19:59 +0000 (+0000) Subject: ext/ogg/gstoggdemux.c: Don't add pads and activate them for skeleton streams. These... X-Git-Tag: 1.19.3~511^2~10303 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4f9bfa6a03a1c1baea83bc35644b3d9dc9b74c3c;p=platform%2Fupstream%2Fgstreamer.git 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 * 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. --- diff --git a/ChangeLog b/ChangeLog index 4897d5d..993599d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-08-23 Sebastian Dröge + + Patch by: Alessandro Dessina + + * 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 * ext/vorbis/vorbisdec.c: (vorbis_dec_change_state): diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c index bb059e8..469a18a 100644 --- a/ext/ogg/gstoggdemux.c +++ b/ext/ogg/gstoggdemux.c @@ -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 */