rtpgstpay: taglists should not be merged in 1.0

This commit is contained in:
Wim Taymans 2013-08-21 10:52:59 +02:00
parent 69b0dcd7df
commit b144809b7c

View file

@ -511,14 +511,12 @@ gst_rtp_gst_pay_sink_event (GstRTPBasePayload * payload, GstEvent * event)
if (gst_tag_list_get_scope (tags) == GST_TAG_SCOPE_STREAM) { if (gst_tag_list_get_scope (tags) == GST_TAG_SCOPE_STREAM) {
GstTagList *old; GstTagList *old;
GST_DEBUG_OBJECT (rtpgstpay, "merging tags %" GST_PTR_FORMAT, tags); GST_DEBUG_OBJECT (rtpgstpay, "storing stream tags %" GST_PTR_FORMAT,
old = rtpgstpay->taglist; tags);
rtpgstpay->taglist = gst_tag_list_merge (rtpgstpay->taglist, tags, if ((old = rtpgstpay->taglist))
GST_TAG_MERGE_REPLACE);
if (old)
gst_tag_list_unref (old); gst_tag_list_unref (old);
rtpgstpay->taglist = gst_tag_list_ref (tags);
} }
etype = 1; etype = 1;
break; break;
} }