From 82cf674653624d694db7284428a5ebaf18a32a2c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 24 Jul 2006 16:33:31 +0000 Subject: [PATCH] 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. --- ChangeLog | 5 +++++ common | 2 +- gst/gsttaglist.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ba210a4c56..29b733651b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-07-24 Tim-Philipp Müller + + * gst/gsttaglist.c: (_gst_tag_initialize): + Allow more than one GST_TAG_IMAGE per taglist. + 2006-07-24 Thomas Vander Stichele * gst/gstminiobject.c: diff --git a/common b/common index 743c74bf92..ef97fb3278 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 743c74bf92546638d3f4272fd5525bf6ef71f794 +Subproject commit ef97fb3278d98a1fdb32e5c6b2a7467116ffc160 diff --git a/gst/gsttaglist.c b/gst/gsttaglist.c index a19ffdd382..bcd931366b 100644 --- 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); } -- 2.34.1