gst/flv/gstflvdemux.c: Use gst_element_class_set_details_simple().

Original commit message from CVS:
* gst/flv/gstflvdemux.c: (gst_flv_demux_chain),
(gst_flv_demux_base_init):
Use gst_element_class_set_details_simple().
If we get GST_FLOW_NOT_LINKED in the parse loop but at least
one of the pads is linked continue the loop.

diff --git a/ChangeLog b/ChangeLog
index fd517b1..b6d8701 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-10-09  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+       * gst/flv/gstflvdemux.c: (gst_flv_demux_chain),
+       (gst_flv_demux_base_init):
+       Use gst_element_class_set_details_simple().
+
+       If we get GST_FLOW_NOT_LINKED in the parse loop but at least
+       one of the pads is linked continue the loop.
+
 2008-10-09  Stefan Kost  <ensonic@users.sf.net>
 
        * ext/amrwb/gstamrwbenc.c:

diff --git a/gst/flv/gstflvdemux.c b/gst/flv/gstflvdemux.c
index e8b229e..89e3f77 100644 (file)
--- a/gst/flv/gstflvdemux.c
+++ b/gst/flv/gstflvdemux.c
@@ -45,13 +45,6 @@ GST_STATIC_PAD_TEMPLATE ("video",
     GST_PAD_SOMETIMES,
     GST_STATIC_CAPS_ANY);
 
-static GstElementDetails flv_demux_details = {
-  "FLV Demuxer",
-  "Codec/Demuxer",
-  "Demux FLV feeds into digital streams",
-  "Julien Moutte <julien@moutte.net>"
-};
-
 GST_DEBUG_CATEGORY (flvdemux_debug);
 #define GST_CAT_DEFAULT flvdemux_debug
 
@@ -188,8 +181,13 @@ gst_flv_demux_chain (GstPad * pad, GstBuffer * buffer)
 
 parse:
   if (G_UNLIKELY (ret != GST_FLOW_OK)) {
-    GST_DEBUG_OBJECT (demux, "got flow return %s", gst_flow_get_name (ret));
-    goto beach;
+    if (ret == GST_FLOW_NOT_LINKED && (demux->audio_linked
+            || demux->video_linked)) {
+      ret = GST_FLOW_OK;
+    } else {
+      GST_DEBUG_OBJECT (demux, "got flow return %s", gst_flow_get_name (ret));
+      goto beach;
+    }
   }
 
   if (G_UNLIKELY (demux->flushing)) {
@@ -1166,7 +1164,10 @@ gst_flv_demux_base_init (gpointer g_class)
       gst_static_pad_template_get (&audio_src_template));
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&video_src_template));
-  gst_element_class_set_details (element_class, &flv_demux_details);
+  gst_element_class_set_details_simple (element_class, "FLV Demuxer",
+      "Codec/Demuxer",
+      "Demux FLV feeds into digital streams",
+      "Julien Moutte <julien@moutte.net>");
 }
 
 static void