ensonic gst-plugins-good: gst-plugins-good/ gst-plugins-good/gst/avi/

CVS Root:       /cvs/gstreamer
Module:         gst-plugins-good
Changes by:     ensonic
Date:           Mon Dec 15 2008  16:00:07 UTC

Log message:
	* gst/avi/gstavimux.c:
	  Instead of filtering wrongly just use the mergemode. Applications is
	  use KEEP_ALL if they want to supress tag-events. Fixes #563221 for
	  avi for real (I hope). Everyone chime in, before I fix the others.

Modified files:
    .               : ChangeLog
    gst/avi         : gstavimux.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ChangeLog.diff?r1=1.3864&r2=1.3865
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/gst/avi/gstavimux.c.diff?r1=1.109&r2=1.110

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/ChangeLog,v
retrieving revision 1.3864
retrieving revision 1.3865
diff -u -d -r1.3864 -r1.3865
--- ChangeLog	15 Dec 2008 12:45:33 -0000	1.3864
+++ ChangeLog	15 Dec 2008 15:59:51 -0000	1.3865
@@ -1,5 +1,12 @@
 2008-12-15  Stefan Kost  <[email protected]>
 
+	* gst/avi/gstavimux.c:
+	  Instead of filtering wrongly just use the mergemode. Applications is
+	  use KEEP_ALL if they want to supress tag-events. Fixes #563221 for
+	  avi for real (I hope). Everyone chime in, before I fix the others.
+
+2008-12-15  Stefan Kost  <[email protected]>
 	* ext/pulse/pulsemixerctrl.c:
 	  Add note about memleak.
Index: gstavimux.c
RCS file: /cvs/gstreamer/gst-plugins-good/gst/avi/gstavimux.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- gstavimux.c	9 Dec 2008 17:55:22 -0000	1.109
+++ gstavimux.c	15 Dec 2008 15:59:53 -0000	1.110
@@ -1687,20 +1687,14 @@
   avimux = GST_AVI_MUX (gst_pad_get_parent (pad));
   switch (GST_EVENT_TYPE (event)) {
-    case GST_EVENT_TAG:
-      if (gst_tag_setter_get_tag_merge_mode (GST_TAG_SETTER (avimux)) !=
-          GST_TAG_MERGE_REPLACE_ALL) {
-        GstTagList *list;
-        gst_event_parse_tag (event, &list);
-        if (avimux->tags) {
-          gst_tag_list_insert (avimux->tags, list, GST_TAG_MERGE_PREPEND);
-        } else {
-          avimux->tags = gst_tag_list_copy (list);
-        }
-      } else {
-        GST_DEBUG ("skipping tag-event");
-      }
+    case GST_EVENT_TAG:{
+      GstTagList *list;
+      gst_event_parse_tag (event, &list);
+      avimux->tags = gst_tag_list_merge (avimux->tags, list,
+          gst_tag_setter_get_tag_merge_mode (GST_TAG_SETTER (avimux)));
       break;
+    }
     default:
   }

------------------------------------------------------------------------------
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you.  Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/