mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 07:16:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/playback/gstdecodebin.c: Don't return a pad from get_our_ghost_pad unless it is actually the one we want.

Browse source 
Original commit message from CVS:
* gst/playback/gstdecodebin.c: (get_our_ghost_pad),
(remove_element_chain):
Don't return a pad from get_our_ghost_pad unless it is actually the
one we want.
Change a cast in remove_element_chain slightly.
This commit is contained in:
Jan Schmidt 2006-10-17 11:34:32 +00:00
parent 3456ed16d4
commit 7696cf6acb
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2006-10-17 Jan Schmidt <thaytan@mad.scientist.com>
* gst/playback/gstdecodebin.c: (get_our_ghost_pad),
(remove_element_chain):
Don't return a pad from get_our_ghost_pad unless it is actually the
one we want.
Change a cast in remove_element_chain slightly.
2006-10-13 Julien MOUTTE <julien@moutte.net> 2006-10-13 Julien MOUTTE <julien@moutte.net>
* tests/examples/seek/seek.c: (do_seek), (start_seek), * tests/examples/seek/seek.c: (do_seek), (start_seek),

7
gst/playback/gstdecodebin.c
View file

@ -974,6 +974,7 @@ get_our_ghost_pad (GstDecodeBin * decode_bin, GstPad * pad)
/* our ghostpads are the sourcepads */ /* our ghostpads are the sourcepads */
pad_it = gst_element_iterate_src_pads (GST_ELEMENT (decode_bin)); pad_it = gst_element_iterate_src_pads (GST_ELEMENT (decode_bin));
while (!done) { while (!done) {
db_pad = NULL;
switch (gst_iterator_next (pad_it, (gpointer) & db_pad)) { switch (gst_iterator_next (pad_it, (gpointer) & db_pad)) {
case GST_ITERATOR_OK: case GST_ITERATOR_OK:
GST_DEBUG_OBJECT (decode_bin, "looking at pad %s:%s", GST_DEBUG_OBJECT (decode_bin, "looking at pad %s:%s",
@ -1072,10 +1073,10 @@ remove_element_chain (GstDecodeBin * decode_bin, GstPad * pad)
GstObject *parent = gst_pad_get_parent (peer); GstObject *parent = gst_pad_get_parent (peer);
if (parent) { if (parent) {
GstElement *grandparent = GST_ELEMENT (gst_object_get_parent (parent)); GstObject *grandparent = gst_object_get_parent (parent);
if (grandparent) { if (grandparent != NULL) {
if (grandparent != GST_ELEMENT (decode_bin)) { if (GST_ELEMENT (grandparent) != GST_ELEMENT (decode_bin)) {
GST_DEBUG_OBJECT (decode_bin, "dead end pad %s:%s parent %s", GST_DEBUG_OBJECT (decode_bin, "dead end pad %s:%s parent %s",
GST_DEBUG_PAD_NAME (peer), GST_OBJECT_NAME (grandparent)); GST_DEBUG_PAD_NAME (peer), GST_OBJECT_NAME (grandparent));
} else { } else {