1 files changed, 8 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 722344e0..bf0c2f5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-05-18  Tim-Philipp Müller  <tim at centricular dot net>
+
+	Patch by: James "Doc" Livingston  <doclivingston gmail com>
+
+	* ext/taglib/gsttaglibmux.c: (gst_tag_lib_mux_render_tag):
+	  Merge event tags and tag setter tags correctly (#339918). Also,
+	  don't leak taglist in case of an error.
+	  
 2006-05-17  Edward Hervey  <edward@fluendo.com>
 
 	* gst/law/mulaw-decode.c: (mulawdec_getcaps):