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

diff --git a/ext/shout/gstshout.c b/ext/shout/gstshout.c
index 533d2cb..39888ba 100644 (file)
--- a/ext/shout/gstshout.c
+++ b/ext/shout/gstshout.c
@@ -75,7 +75,7 @@ sink_template_factory (void)
       GST_PAD_ALWAYS,
       gst_caps_new (
         "icecastsend_sink",
-        "audio/mp3",
+        "audio/x-mp3",
        NULL),
       NULL);
   }

diff --git a/gst-libs/gst/media-info/media-info.c b/gst-libs/gst/media-info/media-info.c
index 08f93eb..4dea33b 100644 (file)
--- 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/gst/mpeg1sys/gstmpeg1systemencode.c b/gst/mpeg1sys/gstmpeg1systemencode.c
index 11cca2d..246a98d 100644 (file)
--- a/gst/mpeg1sys/gstmpeg1systemencode.c
+++ b/gst/mpeg1sys/gstmpeg1systemencode.c
@@ -78,7 +78,7 @@ GST_PAD_TEMPLATE_FACTORY (audio_sink_factory,
   GST_PAD_REQUEST,
   GST_CAPS_NEW (
     "sink_audio",
-    "audio/mp3",
+    "audio/x-mp3",
     NULL
   )
 )

diff --git a/gst/mpegaudioparse/gstmp3types.c b/gst/mpegaudioparse/gstmp3types.c
index d0ee00c..43c82b6 100644 (file)
--- a/gst/mpegaudioparse/gstmp3types.c
+++ b/gst/mpegaudioparse/gstmp3types.c
@@ -24,7 +24,7 @@
 static GstCaps* mp3_type_find(GstBuffer *buf, gpointer private);
 
 static GstTypeDefinition mp3type_definitions[] = {
-  { "mp3types_audio/mp3", "audio/mp3", ".mp3 .mp2 .mp1 .mpga", mp3_type_find },
+  { "mp3types_audio/x-mp3", "audio/x-mp3", ".mp3 .mp2 .mp1 .mpga", mp3_type_find },
   { NULL, NULL, NULL, NULL },
 };
 
@@ -92,7 +92,7 @@ mp3_type_find(GstBuffer *buf, gpointer private)
     return NULL;
 
 done:
-  caps = gst_caps_new ("mp3_type_find", "audio/mp3", NULL);
+  caps = gst_caps_new ("mp3_type_find", "audio/x-mp3", NULL);
 
   return caps;
 }

diff --git a/gst/mpegaudioparse/gstmpegaudioparse.c b/gst/mpegaudioparse/gstmpegaudioparse.c
index fa466f6..f78415f 100644 (file)
--- a/gst/mpegaudioparse/gstmpegaudioparse.c
+++ b/gst/mpegaudioparse/gstmpegaudioparse.c
@@ -42,7 +42,7 @@ mp3_src_factory (void)
        GST_PAD_ALWAYS,
        gst_caps_new (
          "mp3parse_src",
-         "audio/mp3",
+         "audio/x-mp3",
          /*
          gst_props_new (
            "layer",   GST_PROPS_INT_RANGE (1, 3),
@@ -63,7 +63,7 @@ mp3_sink_factory (void)
        GST_PAD_ALWAYS,
        gst_caps_new (
          "mp3parse_sink",
-         "audio/mp3",
+         "audio/x-mp3",
          NULL),
        NULL);
 };