ext/swfdec/gstswfdec.c: Add debugging category and return GstFlowReturn in the right...

Original commit message from CVS:
* ext/swfdec/gstswfdec.c: (gst_swfdec_class_init),
(gst_swfdec_chain), (gst_swfdec_render):
Add debugging category and return GstFlowReturn in the right places
* ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_link):
Get something from the peer pad once we've checked if there is a peer pad.
* gst/qtdemux/qtdemux.c: (gst_qtdemux_change_state),
(qtdemux_tree_get_child_by_type), (qtdemux_parse_trak),
(qtdemux_video_caps):
Couple of fixes

diff --git a/ext/wavpack/gstwavpackdec.c b/ext/wavpack/gstwavpackdec.c
index f3f9d75..d8a4308 100644 (file)
--- a/ext/wavpack/gstwavpackdec.c
+++ b/ext/wavpack/gstwavpackdec.c
@@ -83,13 +83,14 @@ static GstPadLinkReturn
 gst_wavpack_dec_link (GstPad * pad, GstPad * peer)
 {
   GstWavpackDec *wavpackdec = GST_WAVPACK_DEC (gst_pad_get_parent (pad));
-  GstStructure *structure = gst_caps_get_structure (GST_PAD_CAPS (peer), 0);
+  GstStructure *structure;
   GstCaps *srccaps;
   gint bits;
 
   if (!gst_caps_is_fixed (GST_PAD_CAPS (peer)))
     return GST_PAD_LINK_REFUSED;
 
+  structure = gst_caps_get_structure (GST_PAD_CAPS (peer), 0);
   gst_structure_get_int (structure, "rate",
       (gint32 *) & wavpackdec->samplerate);
   gst_structure_get_int (structure, "channels",

diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index 84c2fac..ce01f64 100644 (file)
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -473,7 +473,8 @@ gst_qtdemux_change_state (GstElement * element, GstStateChange transition)
       for (n = 0; n < qtdemux->n_streams; n++) {
         gst_element_remove_pad (element, qtdemux->streams[n]->pad);
         g_free (qtdemux->streams[n]->samples);
-        gst_caps_unref (qtdemux->streams[n]->caps);
+        if (qtdemux->streams[n]->caps)
+          gst_caps_unref (qtdemux->streams[n]->caps);
         g_free (qtdemux->streams[n]);
       }
       qtdemux->n_streams = 0;
@@ -1765,7 +1766,13 @@ qtdemux_tree_get_child_by_type (GNode * node, guint32 fourcc)
       child = g_node_next_sibling (child)) {
     buffer = child->data;
 
+    child_fourcc = GST_READ_UINT32_LE (buffer);
+    GST_LOG ("First chunk of buffer %p is [%" GST_FOURCC_FORMAT "]",
+        buffer, GST_FOURCC_ARGS (child_fourcc));
+
     child_fourcc = GST_READ_UINT32_LE (buffer + 4);
+    GST_LOG ("buffer %p has fourcc [%" GST_FOURCC_FORMAT "]",
+        buffer, GST_FOURCC_ARGS (child_fourcc));
 
     if (child_fourcc == fourcc) {
       return child;
@@ -1899,7 +1906,7 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
   stream = g_new0 (QtDemuxStream, 1);
 
   tkhd = qtdemux_tree_get_child_by_type (trak, FOURCC_tkhd);
-  g_assert (tkhd);
+  g_return_if_fail (tkhd);
 
   GST_LOG ("track[tkhd] version/flags: 0x%08x",
       QTDEMUX_GUINT32_GET (tkhd->data + 8));
@@ -2621,7 +2628,7 @@ qtdemux_video_caps (GstQTDemux * qtdemux, guint32 fourcc,
       return gst_caps_from_string ("image/jpeg");
     case GST_MAKE_FOURCC ('m', 'j', 'p', 'b'):
       _codec ("Motion-JPEG format B");
-      return gst_caps_from_string ("image/jpeg-b");
+      return gst_caps_from_string ("video/x-mjpeg-b");
     case GST_MAKE_FOURCC ('S', 'V', 'Q', '3'):
       _codec ("Sorensen video v.3");
       return gst_caps_from_string ("video/x-svq, " "svqversion = (int) 3");