From efa337df0a1abf0039e9a7591ad8fcf3f34fc464 Mon Sep 17 00:00:00 2001
From: Iain Holmes <iain@prettypeople.org>
Date: Sun, 8 Dec 2002 17:20:41 +0000
Subject: 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/avi/gstavidemux.c | 4 ++--
 gst/avi/gstavimux.c   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'gst/avi')

diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c
index 0280b657..a44554b3 100644
--- a/gst/avi/gstavidemux.c
+++ b/gst/avi/gstavidemux.c
@@ -144,7 +144,7 @@ GST_PAD_TEMPLATE_FACTORY (src_audio_templ,
   ),
   GST_CAPS_NEW (
     "avidemux_src_audio",
-    "audio/mp3",
+    "audio/x-mp3",
       NULL
   ),
   GST_CAPS_NEW (
@@ -520,7 +520,7 @@ gst_avi_demux_strf_auds (GstAviDemux *avi_demux)
     case GST_RIFF_WAVE_FORMAT_MPEGL3:
     case GST_RIFF_WAVE_FORMAT_MPEGL12: /* mp3 */
       newcaps = gst_caps_new ("avidemux_audio_src",
-                              "audio/mp3",
+                              "audio/x-mp3",
                                 NULL);
       break;
     case GST_RIFF_WAVE_FORMAT_PCM: /* PCM/wav */
diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c
index 695cda54..880e8a86 100644
--- a/gst/avi/gstavimux.c
+++ b/gst/avi/gstavimux.c
@@ -155,7 +155,7 @@ GST_PAD_TEMPLATE_FACTORY (audio_sink_factory,
   ),
   GST_CAPS_NEW (
     "avimux_sink_audio",
-    "audio/mp3",
+    "audio/x-mp3",
       NULL
   ),
   GST_CAPS_NEW (
@@ -417,7 +417,7 @@ gst_avimux_sinkconnect (GstPad *pad, GstCaps *vscaps)
       avimux->auds_hdr.samplesize = avimux->auds_hdr.scale = avimux->auds.blockalign = width * avimux->auds.channels/8;
       goto done;
     }
-    else if (!strcmp (mimetype, "audio/mp3"))
+    else if (!strcmp (mimetype, "audio/x-mp3"))
     {
       gint layer;
 
-- 
cgit