diff options
author | mutex at runbox dot com <mutex@runbox.com> | 2007-10-01 09:21:19 +0000 |
---|---|---|
committer | Sebastian Dröge <slomo@circular-chaos.org> | 2007-10-01 09:21:19 +0000 |
commit | 0813fdac806a7f380a48af885a8296bb14d6b81c (patch) | |
tree | 16db0c1c7939a86ff614c1a854face511c87cf97 /gst/mpegtsparse/mpegtsparse.c | |
parent | c553adff7a7e90231fb4e74cced3b895f60e04e7 (diff) | |
download | gst-plugins-bad-0813fdac806a7f380a48af885a8296bb14d6b81c.tar.gz gst-plugins-bad-0813fdac806a7f380a48af885a8296bb14d6b81c.tar.bz2 gst-plugins-bad-0813fdac806a7f380a48af885a8296bb14d6b81c.zip |
gst/mpegtsparse/: Remove useless src pad that only results in not linked errors, fix a broken pointer dereference and...
Original commit message from CVS:
Patch by: mutex at runbox dot com
* gst/mpegtsparse/mpegtspacketizer.c:
(mpegts_packetizer_parse_adaptation_field_control):
* gst/mpegtsparse/mpegtsparse.c: (mpegts_parse_base_init),
(mpegts_parse_init), (mpegts_parse_push):
* gst/mpegtsparse/mpegtsparse.h:
Remove useless src pad that only results in not linked errors,
fix a broken pointer dereference and make MAX_CONTINUITY constant
conform to the standard to stop outputting corrupted data.
Fixes #481276, #481279.
Diffstat (limited to 'gst/mpegtsparse/mpegtsparse.c')
-rw-r--r-- | gst/mpegtsparse/mpegtsparse.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/gst/mpegtsparse/mpegtsparse.c b/gst/mpegtsparse/mpegtsparse.c index 0d0a4232..914bed36 100644 --- a/gst/mpegtsparse/mpegtsparse.c +++ b/gst/mpegtsparse/mpegtsparse.c @@ -83,12 +83,6 @@ static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink", GST_STATIC_CAPS ("video/mpegts, " "systemstream = (boolean) true ") ); -static GstStaticPadTemplate src_template = -GST_STATIC_PAD_TEMPLATE ("src", GST_PAD_SRC, - GST_PAD_ALWAYS, - GST_STATIC_CAPS ("video/mpegts, " "systemstream = (boolean) true ") - ); - static GstStaticPadTemplate program_template = GST_STATIC_PAD_TEMPLATE ("program_%d", GST_PAD_SRC, GST_PAD_SOMETIMES, @@ -146,8 +140,6 @@ mpegts_parse_base_init (gpointer klass) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_template)); gst_element_class_add_pad_template (element_class, - gst_static_pad_template_get (&src_template)); - gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&program_template)); gst_element_class_set_details (element_class, &mpegts_parse_details); @@ -218,9 +210,6 @@ mpegts_parse_init (MpegTSParse * parse, MpegTSParseClass * klass) gst_pad_set_event_function (parse->sinkpad, mpegts_parse_sink_event); gst_element_add_pad (GST_ELEMENT (parse), parse->sinkpad); - parse->srcpad = mpegts_parse_create_tspad (parse, "src")->pad; - gst_element_add_pad (GST_ELEMENT (parse), parse->srcpad); - parse->disposed = FALSE; parse->packetizer = mpegts_packetizer_new (); parse->program_numbers = g_strdup (""); @@ -597,14 +586,10 @@ mpegts_parse_push (MpegTSParse * parse, MpegTSPacketizerPacket * packet) MpegTSParsePad *tspad; guint16 pid; GstBuffer *buffer; - GstFlowReturn ret = GST_FLOW_NOT_LINKED; - GstCaps *caps; + GstFlowReturn ret = GST_FLOW_OK; pid = packet->pid; - caps = gst_pad_get_caps (parse->srcpad); buffer = packet->buffer; - gst_buffer_set_caps (buffer, caps); - gst_caps_unref (caps); GST_OBJECT_LOCK (parse); /* clear tspad->pushed on pads */ |