gst/gsttaglist.c: Allow more than one GST_TAG_IMAGE per taglist.

Original commit message from CVS:
* gst/gsttaglist.c: (_gst_tag_initialize):
Allow more than one GST_TAG_IMAGE per taglist.

diff --git a/ChangeLog b/ChangeLog
index ba210a4c56ac1d4a70c86f6c1b52cacbf30cd874..29b733651b69d56d1c3a9f8fdaea8b4f055c655d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-24  Tim-Philipp Müller  <tim at centricular dot net>
+
+       * gst/gsttaglist.c: (_gst_tag_initialize):
+         Allow more than one GST_TAG_IMAGE per taglist.
+
 2006-07-24  Thomas Vander Stichele  <thomas at apestaart dot org>
 
        * gst/gstminiobject.c:

diff --git a/common b/common
index 743c74bf92546638d3f4272fd5525bf6ef71f794..ef97fb3278d98a1fdb32e5c6b2a7467116ffc160 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 743c74bf92546638d3f4272fd5525bf6ef71f794
+Subproject commit ef97fb3278d98a1fdb32e5c6b2a7467116ffc160

diff --git a/gst/gsttaglist.c b/gst/gsttaglist.c
index a19ffdd382b9874893dd7197abd6cc1134286f8f..bcd931366b1b1e5147db489ca71701f85440dd72 100644 (file)
--- a/gst/gsttaglist.c
+++ b/gst/gsttaglist.c
@@ -205,7 +205,7 @@ _gst_tag_initialize (void)
       _("language code"),
       _("language code for this stream, conforming to ISO-639-1"), NULL);
   gst_tag_register (GST_TAG_IMAGE, GST_TAG_FLAG_META, GST_TYPE_BUFFER,
-      _("image"), _("image related to this stream"), NULL);
+      _("image"), _("image related to this stream"), gst_tag_merge_use_first);
   gst_tag_register (GST_TAG_PREVIEW_IMAGE, GST_TAG_FLAG_META, GST_TYPE_BUFFER,
       _("preview image"), _("preview image related to this stream"), NULL);
 }