Commit 8add2939 authored by Stefan Kost's avatar Stefan Kost
Browse files

gst/avi/gstavimux.c: Instead of filtering wrongly just use the mergemode....

gst/avi/gstavimux.c: Instead of filtering wrongly just use the mergemode. Applications is use KEEP_ALL if they want t...

Original commit message from CVS:
* 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.
parent 49ad7ace
2008-12-15 Stefan Kost <ensonic@users.sf.net>
* 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 <ensonic@users.sf.net>
* ext/pulse/pulsemixerctrl.c:
......
......@@ -1687,20 +1687,14 @@ gst_avi_mux_handle_event (GstPad * pad, GstEvent * event)
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:
break;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment