From 76a22a6ebbe6bb1f57773867176ab0c97c6c6781 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 26 Jan 2012 10:28:51 +0100 Subject: [PATCH] flvmux: Update for new collectpads2 event handling API --- gst/flv/gstflvmux.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gst/flv/gstflvmux.c b/gst/flv/gstflvmux.c index 594c334..6aecb99 100644 --- a/gst/flv/gstflvmux.c +++ b/gst/flv/gstflvmux.c @@ -305,7 +305,6 @@ gst_flv_mux_handle_sink_event (GstCollectPads2 * pads, GstCollectData2 * data, ret = gst_flv_mux_audio_pad_setcaps (data->pad, caps); } /* and eat */ - ret = FALSE; gst_event_unref (event); break; } @@ -317,13 +316,20 @@ gst_flv_mux_handle_sink_event (GstCollectPads2 * pads, GstCollectData2 * data, gst_event_parse_tag (event, &list); gst_tag_setter_merge_tags (setter, list, mode); mux->new_tags = TRUE; + ret = TRUE; + gst_event_unref (event); break; } + case GST_EVENT_EOS: + case GST_EVENT_SEGMENT: + gst_event_unref (event); + ret = TRUE; + break; default: + ret = gst_pad_event_default (data->pad, GST_OBJECT (mux), event); break; } - /* now GstCollectPads2 can take care of the rest, e.g. EOS */ return ret; } -- 2.7.4