From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Wed, 21 Aug 2013 08:52:59 +0000 (+0200)
Subject: rtpgstpay: taglists should not be merged in 1.0
X-Git-Tag: 1.1.4~36
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b144809b7c01b8d36367fff4efb7d3383fe600fd;p=platform%2Fupstream%2Fgst-plugins-good.git

rtpgstpay: taglists should not be merged in 1.0
---

diff --git a/gst/rtp/gstrtpgstpay.c b/gst/rtp/gstrtpgstpay.c
index ece10d3..55c356c 100644
--- a/gst/rtp/gstrtpgstpay.c
+++ b/gst/rtp/gstrtpgstpay.c
@@ -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) {
         GstTagList *old;
 
-        GST_DEBUG_OBJECT (rtpgstpay, "merging tags %" GST_PTR_FORMAT, tags);
-        old = rtpgstpay->taglist;
-        rtpgstpay->taglist = gst_tag_list_merge (rtpgstpay->taglist, tags,
-            GST_TAG_MERGE_REPLACE);
-        if (old)
+        GST_DEBUG_OBJECT (rtpgstpay, "storing stream tags %" GST_PTR_FORMAT,
+            tags);
+        if ((old = rtpgstpay->taglist))
           gst_tag_list_unref (old);
+        rtpgstpay->taglist = gst_tag_list_ref (tags);
       }
-
       etype = 1;
       break;
     }