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
This commit is contained in:
Iain Holmes 2002-12-08 17:20:41 +00:00
parent e16c50551b
commit efa337df0a
4 changed files with 10 additions and 10 deletions

View file

@ -37,7 +37,7 @@ flac_caps_factory (void)
return return
gst_caps_new ( gst_caps_new (
"flac_flac", "flac_flac",
"audio/x-flac", "application/x-flac",
NULL); NULL);
} }
@ -61,8 +61,8 @@ raw_caps_factory (void)
} }
static GstTypeDefinition flacdefinition = { static GstTypeDefinition flacdefinition = {
"flac_audio/x-flac", "flac_application/x-flac",
"audio/x-flac", "application/x-flac",
".flac", ".flac",
flac_type_find, flac_type_find,
}; };
@ -75,7 +75,7 @@ flac_type_find (GstBuffer *buf, gpointer private)
if (head != 0x664C6143) if (head != 0x664C6143)
return NULL; return NULL;
return gst_caps_new ("flac_type_find", "audio/x-flac", NULL); return gst_caps_new ("flac_type_find", "application/x-flac", NULL);
} }

View file

@ -69,7 +69,7 @@ sink_template_factory (void)
NULL), NULL),
gst_caps_new ( gst_caps_new (
"shout2send_sink", "shout2send_sink",
"audio/mp3", "audio/x-mp3",
NULL), NULL),
NULL); NULL);
} }
@ -324,7 +324,7 @@ gst_shout2send_connect (GstPad *pad, GstCaps *caps)
{ {
if (!strcmp(gst_caps_get_mime (caps), "audio/mp3")) if (!strcmp(gst_caps_get_mime (caps), "audio/x-mp3"))
{ {
audio_format = SHOUT_FORMAT_MP3; audio_format = SHOUT_FORMAT_MP3;
return GST_PAD_CONNECT_OK; return GST_PAD_CONNECT_OK;

View file

@ -144,7 +144,7 @@ GST_PAD_TEMPLATE_FACTORY (src_audio_templ,
), ),
GST_CAPS_NEW ( GST_CAPS_NEW (
"avidemux_src_audio", "avidemux_src_audio",
"audio/mp3", "audio/x-mp3",
NULL NULL
), ),
GST_CAPS_NEW ( 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_MPEGL3:
case GST_RIFF_WAVE_FORMAT_MPEGL12: /* mp3 */ case GST_RIFF_WAVE_FORMAT_MPEGL12: /* mp3 */
newcaps = gst_caps_new ("avidemux_audio_src", newcaps = gst_caps_new ("avidemux_audio_src",
"audio/mp3", "audio/x-mp3",
NULL); NULL);
break; break;
case GST_RIFF_WAVE_FORMAT_PCM: /* PCM/wav */ case GST_RIFF_WAVE_FORMAT_PCM: /* PCM/wav */

View file

@ -155,7 +155,7 @@ GST_PAD_TEMPLATE_FACTORY (audio_sink_factory,
), ),
GST_CAPS_NEW ( GST_CAPS_NEW (
"avimux_sink_audio", "avimux_sink_audio",
"audio/mp3", "audio/x-mp3",
NULL NULL
), ),
GST_CAPS_NEW ( 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; avimux->auds_hdr.samplesize = avimux->auds_hdr.scale = avimux->auds.blockalign = width * avimux->auds.channels/8;
goto done; goto done;
} }
else if (!strcmp (mimetype, "audio/mp3")) else if (!strcmp (mimetype, "audio/x-mp3"))
{ {
gint layer; gint layer;