mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 14:26:43 +00:00
Code Issues 1 Projects Releases Wiki Activity

[MOVED FROM BAD 25/57] gst/flv/gstflvdemux.c: Use gst_element_class_set_details_simple().

Browse source 
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.
This commit is contained in:
Sebastian Dröge 2008-10-09 15:26:56 +00:00 committed by Sebastian Dröge
parent fa59b574ba
commit fe312ae650
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gst/flv/gstflvdemux.c
View file

@ -45,13 +45,6 @@ GST_STATIC_PAD_TEMPLATE ("video",
GST_PAD_SOMETIMES, GST_PAD_SOMETIMES,
GST_STATIC_CAPS_ANY); 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); GST_DEBUG_CATEGORY (flvdemux_debug);
#define GST_CAT_DEFAULT flvdemux_debug #define GST_CAT_DEFAULT flvdemux_debug
@ -188,8 +181,13 @@ gst_flv_demux_chain (GstPad * pad, GstBuffer * buffer)
parse: parse:
if (G_UNLIKELY (ret != GST_FLOW_OK)) { if (G_UNLIKELY (ret != GST_FLOW_OK)) {
GST_DEBUG_OBJECT (demux, "got flow return %s", gst_flow_get_name (ret)); if (ret == GST_FLOW_NOT_LINKED && (demux->audio_linked
goto beach; || 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)) { 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_static_pad_template_get (&audio_src_template));
gst_element_class_add_pad_template (element_class, gst_element_class_add_pad_template (element_class,
gst_static_pad_template_get (&video_src_template)); 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 static void