From 1d20c0f4bb1d2af48e4d71506120a1c999c791e7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 10 May 2013 11:24:46 +0200 Subject: [PATCH] oggmux: Make sure to always set caps on the srcpad and always send a segment event Even if the srcpad is not linked at this point, it might be linked as result of setting the caps. --- ext/ogg/gstoggmux.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/ext/ogg/gstoggmux.c b/ext/ogg/gstoggmux.c index f4c914a..a125da9 100644 --- a/ext/ogg/gstoggmux.c +++ b/ext/ogg/gstoggmux.c @@ -1543,16 +1543,21 @@ gst_ogg_mux_send_headers (GstOggMux * mux) if (caps) { if (!gst_caps_is_fixed (caps)) caps = gst_caps_fixate (caps); - if (caps) { - GstSegment segment; + } + if (!caps) + caps = gst_caps_new_empty_simple ("application/ogg"); - caps = gst_ogg_mux_set_header_on_caps (caps, hbufs); - gst_pad_set_caps (mux->srcpad, caps); - gst_segment_init (&segment, GST_FORMAT_TIME); - gst_pad_push_event (mux->srcpad, gst_event_new_segment (&segment)); - gst_caps_unref (caps); - } + caps = gst_ogg_mux_set_header_on_caps (caps, hbufs); + gst_pad_set_caps (mux->srcpad, caps); + gst_caps_unref (caps); + + /* Send segment event */ + { + GstSegment segment; + gst_segment_init (&segment, GST_FORMAT_TIME); + gst_pad_push_event (mux->srcpad, gst_event_new_segment (&segment)); } + /* and send the buffers */ while (hbufs != NULL) { GstBuffer *buf = GST_BUFFER (hbufs->data); -- 2.7.4