diff --git a/ChangeLog b/ChangeLog
index ac6f653577..8c3bb40640 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-22  Julien MOUTTE <julien@moutte.net>
+
+	* gst/gsttag.c: (_gst_tag_initialize): Registering 2 new tags,
+	audio-codec and video-codec.
+
 2004-02-22  Benjamin Otte  <otte@gnome.org>
 
 	reported by: Padraig O'Briain <padraig.obriain@sun.com>
diff --git a/gst/gsttag.c b/gst/gsttag.c
index bb866f5674..c509a56a52 100644
--- a/gst/gsttag.c
+++ b/gst/gsttag.c
@@ -161,7 +161,7 @@ _gst_tag_initialize (void)
 		    _("contact"),
 		    _("contact information"),
 		    gst_tag_merge_strings_with_comma);
-  gst_tag_register (GST_TAG_LICENSE,	 GST_TAG_FLAG_META,
+  gst_tag_register (GST_TAG_LICENSE, GST_TAG_FLAG_META,
 		    G_TYPE_STRING,
 		    _("license"),
 		    _("license of data"),
@@ -181,6 +181,16 @@ _gst_tag_initialize (void)
 		    _("codec"),
 		    _("codec the data is stored in"),
 		    gst_tag_merge_strings_with_comma);
+  gst_tag_register (GST_TAG_VIDEO_CODEC, GST_TAG_FLAG_ENCODED,
+		    G_TYPE_STRING,
+		    _("video-codec"),
+		    _("codec the video data is stored in"),
+		    NULL);
+  gst_tag_register (GST_TAG_AUDIO_CODEC, GST_TAG_FLAG_ENCODED,
+		    G_TYPE_STRING,
+		    _("audio-codec"),
+		    _("codec the audio data is stored in"),
+		    NULL);
   gst_tag_register (GST_TAG_BITRATE, GST_TAG_FLAG_ENCODED,
 		    G_TYPE_UINT,
 		    _("bitrate"),
@@ -953,7 +963,3 @@ TAG_MERGE_FUNCS (double, gdouble)
   
 #define COPY_FUNC g_strdup
 TAG_MERGE_FUNCS (string, gchar *)
-
-
-
-
diff --git a/gst/gsttaglist.c b/gst/gsttaglist.c
index bb866f5674..c509a56a52 100644
--- a/gst/gsttaglist.c
+++ b/gst/gsttaglist.c
@@ -161,7 +161,7 @@ _gst_tag_initialize (void)
 		    _("contact"),
 		    _("contact information"),
 		    gst_tag_merge_strings_with_comma);
-  gst_tag_register (GST_TAG_LICENSE,	 GST_TAG_FLAG_META,
+  gst_tag_register (GST_TAG_LICENSE, GST_TAG_FLAG_META,
 		    G_TYPE_STRING,
 		    _("license"),
 		    _("license of data"),
@@ -181,6 +181,16 @@ _gst_tag_initialize (void)
 		    _("codec"),
 		    _("codec the data is stored in"),
 		    gst_tag_merge_strings_with_comma);
+  gst_tag_register (GST_TAG_VIDEO_CODEC, GST_TAG_FLAG_ENCODED,
+		    G_TYPE_STRING,
+		    _("video-codec"),
+		    _("codec the video data is stored in"),
+		    NULL);
+  gst_tag_register (GST_TAG_AUDIO_CODEC, GST_TAG_FLAG_ENCODED,
+		    G_TYPE_STRING,
+		    _("audio-codec"),
+		    _("codec the audio data is stored in"),
+		    NULL);
   gst_tag_register (GST_TAG_BITRATE, GST_TAG_FLAG_ENCODED,
 		    G_TYPE_UINT,
 		    _("bitrate"),
@@ -953,7 +963,3 @@ TAG_MERGE_FUNCS (double, gdouble)
   
 #define COPY_FUNC g_strdup
 TAG_MERGE_FUNCS (string, gchar *)
-
-
-
-