From f21808c6a8e56f50ab032dd6da89b6297644bf4c Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rbultje@ronald.bitfreak.net>
Date: Fri, 23 Jan 2004 13:18:46 +0000
Subject: [PATCH] gst/gsttag.*: Add application tag (for encoding/muxing app).

Original commit message from CVS:
2004-01-23  Ronald Bultje  <rbultje@ronald.bitfreak.net>

* gst/gsttag.c: (_gst_tag_initialize):
* gst/gsttag.h:
Add application tag (for encoding/muxing app).
---
 ChangeLog        | 6 ++++++
 common           | 2 +-
 gst/gsttag.c     | 9 +++++++--
 gst/gsttag.h     | 1 +
 gst/gsttaglist.c | 9 +++++++--
 gst/gsttaglist.h | 1 +
 6 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d481ea5222..8fb8296374 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-23  Ronald Bultje  <rbultje@ronald.bitfreak.net>
+
+	* gst/gsttag.c: (_gst_tag_initialize):
+	* gst/gsttag.h:
+	  Add application tag (for encoding/muxing app).
+
 2004-01-23  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* autogen.sh:
diff --git a/common b/common
index c81ad072c7..0bcde34201 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit c81ad072c76522175cbddead96d6f3c448068d67
+Subproject commit 0bcde342015b96d9a6ba3b9d9102e2a543399d96
diff --git a/gst/gsttag.c b/gst/gsttag.c
index 25acc8b72b..e0bbed0a69 100644
--- a/gst/gsttag.c
+++ b/gst/gsttag.c
@@ -142,8 +142,13 @@ _gst_tag_initialize (void)
 		    _("performer"),
 		    _("person(s) performing"),
 		    gst_tag_merge_strings_with_comma);
-  gst_tag_register (GST_TAG_DURATION,
-		    G_TYPE_UINT64, GST_TAG_FLAG_DECODED,
+  gst_tag_register (GST_TAG_APPLICATION, GST_TAG_FLAG_META,
+		    G_TYPE_STRING,
+		    _("application"),
+		    _("application that wrote the stream"),
+		    gst_tag_merge_strings_with_comma);
+  gst_tag_register (GST_TAG_DURATION, GST_TAG_FLAG_DECODED,
+		    G_TYPE_UINT64,
 		    _("duration"),
 		    _("length in GStreamer time units (nanoseconds)"),
 		    NULL);
diff --git a/gst/gsttag.h b/gst/gsttag.h
index 1be5984b78..37d45d182d 100644
--- a/gst/gsttag.h
+++ b/gst/gsttag.h
@@ -240,6 +240,7 @@ GstTagList *	gst_event_tag_get_list		(GstEvent *		tag_event);
 #define GST_TAG_CONTACT			"contact"
 #define GST_TAG_LICENSE			"license"
 #define GST_TAG_PERFORMER		"performer"
+#define GST_TAG_APPLICATION             "application"
 #define GST_TAG_DURATION		"duration"
 #define GST_TAG_CODEC			"codec"
 #define GST_TAG_BITRATE			"bitrate"
diff --git a/gst/gsttaglist.c b/gst/gsttaglist.c
index 25acc8b72b..e0bbed0a69 100644
--- a/gst/gsttaglist.c
+++ b/gst/gsttaglist.c
@@ -142,8 +142,13 @@ _gst_tag_initialize (void)
 		    _("performer"),
 		    _("person(s) performing"),
 		    gst_tag_merge_strings_with_comma);
-  gst_tag_register (GST_TAG_DURATION,
-		    G_TYPE_UINT64, GST_TAG_FLAG_DECODED,
+  gst_tag_register (GST_TAG_APPLICATION, GST_TAG_FLAG_META,
+		    G_TYPE_STRING,
+		    _("application"),
+		    _("application that wrote the stream"),
+		    gst_tag_merge_strings_with_comma);
+  gst_tag_register (GST_TAG_DURATION, GST_TAG_FLAG_DECODED,
+		    G_TYPE_UINT64,
 		    _("duration"),
 		    _("length in GStreamer time units (nanoseconds)"),
 		    NULL);
diff --git a/gst/gsttaglist.h b/gst/gsttaglist.h
index 1be5984b78..37d45d182d 100644
--- a/gst/gsttaglist.h
+++ b/gst/gsttaglist.h
@@ -240,6 +240,7 @@ GstTagList *	gst_event_tag_get_list		(GstEvent *		tag_event);
 #define GST_TAG_CONTACT			"contact"
 #define GST_TAG_LICENSE			"license"
 #define GST_TAG_PERFORMER		"performer"
+#define GST_TAG_APPLICATION             "application"
 #define GST_TAG_DURATION		"duration"
 #define GST_TAG_CODEC			"codec"
 #define GST_TAG_BITRATE			"bitrate"