From: <th...@ke...> - 2006-10-17 11:34:44
|
CVS Root: /cvs/gstreamer Module: gst-plugins-base Changes by: thaytan Date: Tue Oct 17 2006 11:34:44 UTC Log message: * 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. Modified files: . : ChangeLog gst/playback : gstdecodebin.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ChangeLog.diff?r1=1.2967&r2=1.2968 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst/playback/gstdecodebin.c.diff?r1=1.84&r2=1.85 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-base/ChangeLog,v retrieving revision 1.2967 retrieving revision 1.2968 diff -u -d -r1.2967 -r1.2968 --- ChangeLog 13 Oct 2006 15:20:29 -0000 1.2967 +++ ChangeLog 17 Oct 2006 11:34:31 -0000 1.2968 @@ -1,3 +1,11 @@ +2006-10-17 Jan Schmidt <th...@ma...> + + * 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 <ju...@mo...> * tests/examples/seek/seek.c: (do_seek), (start_seek), Index: gstdecodebin.c RCS file: /cvs/gstreamer/gst-plugins-base/gst/playback/gstdecodebin.c,v retrieving revision 1.84 retrieving revision 1.85 diff -u -d -r1.84 -r1.85 --- gstdecodebin.c 10 Oct 2006 12:49:02 -0000 1.84 +++ gstdecodebin.c 17 Oct 2006 11:34:32 -0000 1.85 @@ -974,6 +974,7 @@ /* our ghostpads are the sourcepads */ pad_it = gst_element_iterate_src_pads (GST_ELEMENT (decode_bin)); while (!done) { + db_pad = NULL; switch (gst_iterator_next (pad_it, (gpointer) & db_pad)) { case GST_ITERATOR_OK: GST_DEBUG_OBJECT (decode_bin, "looking at pad %s:%s", @@ -1072,10 +1073,10 @@ GstObject *parent = gst_pad_get_parent (peer); if (parent) { - GstElement *grandparent = GST_ELEMENT (gst_object_get_parent (parent)); + GstObject *grandparent = gst_object_get_parent (parent); - if (grandparent) { - if (grandparent != GST_ELEMENT (decode_bin)) { + if (grandparent != NULL) { + if (GST_ELEMENT (grandparent) != GST_ELEMENT (decode_bin)) { GST_DEBUG_OBJECT (decode_bin, "dead end pad %s:%s parent %s", GST_DEBUG_PAD_NAME (peer), GST_OBJECT_NAME (grandparent)); } else { |