diff options
| author | Sebastian Dröge <slomo@circular-chaos.org> | 2008-10-09 15:26:56 +0000 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-05-12 21:20:55 +0200 |
| commit | fe312ae6500a43cc57b32959bb554da5250203c0 (patch) | |
| tree | fa0ae6b66df5a016413cdb2bdc59c4fd07a74f8a /gst/flv | |
| parent | fa59b574ba362abe4c65742536320b0fce3354d8 (diff) | |
[MOVED FROM BAD 25/57] 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.
Diffstat (limited to 'gst/flv')
| -rw-r--r-- | gst/flv/gstflvdemux.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/gst/flv/gstflvdemux.c b/gst/flv/gstflvdemux.c index e8b229ea..89e3f77a 100644 --- 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 |