mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-05 02:02:26 +00:00
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.
This commit is contained in:
parent
49ad7ace92
commit
8add29398d
2 changed files with 14 additions and 13 deletions
|
@ -1,3 +1,10 @@
|
||||||
|
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>
|
2008-12-15 Stefan Kost <ensonic@users.sf.net>
|
||||||
|
|
||||||
* ext/pulse/pulsemixerctrl.c:
|
* 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));
|
avimux = GST_AVI_MUX (gst_pad_get_parent (pad));
|
||||||
|
|
||||||
switch (GST_EVENT_TYPE (event)) {
|
switch (GST_EVENT_TYPE (event)) {
|
||||||
case GST_EVENT_TAG:
|
case GST_EVENT_TAG:{
|
||||||
if (gst_tag_setter_get_tag_merge_mode (GST_TAG_SETTER (avimux)) !=
|
GstTagList *list;
|
||||||
GST_TAG_MERGE_REPLACE_ALL) {
|
|
||||||
GstTagList *list;
|
gst_event_parse_tag (event, &list);
|
||||||
gst_event_parse_tag (event, &list);
|
avimux->tags = gst_tag_list_merge (avimux->tags, list,
|
||||||
if (avimux->tags) {
|
gst_tag_setter_get_tag_merge_mode (GST_TAG_SETTER (avimux)));
|
||||||
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");
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue