From 3332daedadec0167263c059c0bd6994b769dea2e Mon Sep 17 00:00:00 2001
From: Iain Holmes <iain@prettypeople.org>
Date: Sun, 8 Dec 2002 17:20:45 +0000
Subject: [PATCH] Replace audio/mp3 with audio/x-mp3 and audio/x-flac with
 application/x-flac

Original commit message from CVS:
Replace audio/mp3 with audio/x-mp3 and audio/x-flac with application/x-flac
---
 gst-libs/gst/media-info/media-info.c | 2 +-
 testsuite/autoplug/autoplug2.c       | 6 +++---
 testsuite/autoplug/autoplug3.c       | 2 +-
 testsuite/autoplug/autoplug4.c       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gst-libs/gst/media-info/media-info.c b/gst-libs/gst/media-info/media-info.c
index 08f93eb601..4dea33b45d 100644
--- a/gst-libs/gst/media-info/media-info.c
+++ b/gst-libs/gst/media-info/media-info.c
@@ -409,7 +409,7 @@ gst_media_info_get_decoder (GstMediaInfo *info, const char *mime)
     GMI_DEBUG("DEBUG: no decoder in table, inserting one\n");
     if (strcmp (mime, "application/x-ogg") == 0)
       factory = g_strdup ("vorbisfile");
-    else if (strcmp (mime, "audio/mp3") == 0)
+    else if (strcmp (mime, "audio/x-mp3") == 0)
       factory = g_strdup ("mad");
     else if (strcmp (mime, "audio/x-wav") == 0)
       factory = g_strdup ("wavparse");
diff --git a/testsuite/autoplug/autoplug2.c b/testsuite/autoplug/autoplug2.c
index 163d4f9f16..ce96c92f15 100644
--- a/testsuite/autoplug/autoplug2.c
+++ b/testsuite/autoplug/autoplug2.c
@@ -21,9 +21,9 @@ main (int argc, char *argv[])
 
   autoplug = gst_autoplug_factory_make ("static");
   
-  g_print ("Autoplugging between audio/mp3 and audio/raw ...\n");
-  if ((element = autoplug_caps (autoplug, "audio/mp3", "audio/raw")) == NULL)
-    g_print ("Could not autoplug between audio/mp3 and audio/raw !\n");
+  g_print ("Autoplugging between audio/x-mp3 and audio/raw ...\n");
+  if ((element = autoplug_caps (autoplug, "audio/x-mp3", "audio/raw")) == NULL)
+    g_print ("Could not autoplug between audio/x-mp3 and audio/raw !\n");
   xmlSaveFile ("autoplug2_1.gst", gst_xml_write (element));
 
   g_print ("Autoplugging between video/mpeg and audio/raw ...\n");
diff --git a/testsuite/autoplug/autoplug3.c b/testsuite/autoplug/autoplug3.c
index b0af9aaf95..2925eef23d 100644
--- a/testsuite/autoplug/autoplug3.c
+++ b/testsuite/autoplug/autoplug3.c
@@ -20,7 +20,7 @@ main (int argc, char *argv[])
   element = gst_autoplug_to_renderers (autoplug, 
 		                       gst_caps_new (
 					 "mp3caps", 
-					 "audio/mp3",
+					 "audio/x-mp3",
 					 NULL
 				       ), 
 				       sink,
diff --git a/testsuite/autoplug/autoplug4.c b/testsuite/autoplug/autoplug4.c
index 9195c7b05e..b745c71982 100644
--- a/testsuite/autoplug/autoplug4.c
+++ b/testsuite/autoplug/autoplug4.c
@@ -17,7 +17,7 @@ main (int argc, char *argv[])
   autoplug2 = gst_autoplug_factory_make ("static");
   
   element = gst_autoplug_to_renderers (autoplug, 
-		  gst_caps_new ("mp3caps", "audio/mp3", NULL), sink2, NULL);
+		  gst_caps_new ("mp3caps", "audio/x-mp3", NULL), sink2, NULL);
   xmlSaveFile ("autoplug3_1.gst", gst_xml_write (element));
 
   element = gst_autoplug_to_renderers (autoplug,