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:44 +00:00
parent f1f464b7b2
commit ac04104547
6 changed files with 8 additions and 8 deletions

View file

@ -65,7 +65,7 @@ GST_PAD_TEMPLATE_FACTORY (gst_lame_src_factory,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_CAPS_NEW ( GST_CAPS_NEW (
"gstlame_src", "gstlame_src",
"audio/mp3", "audio/x-mp3",
NULL NULL
) )
) )

View file

@ -130,7 +130,7 @@ GST_PAD_TEMPLATE_FACTORY (mad_sink_template_factory,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_CAPS_NEW ( GST_CAPS_NEW (
"mad_sink", "mad_sink",
"audio/mp3", "audio/x-mp3",
NULL NULL
) )
) )

View file

@ -409,7 +409,7 @@ gst_media_info_get_decoder (GstMediaInfo *info, const char *mime)
GMI_DEBUG("DEBUG: no decoder in table, inserting one\n"); GMI_DEBUG("DEBUG: no decoder in table, inserting one\n");
if (strcmp (mime, "application/x-ogg") == 0) if (strcmp (mime, "application/x-ogg") == 0)
factory = g_strdup ("vorbisfile"); factory = g_strdup ("vorbisfile");
else if (strcmp (mime, "audio/mp3") == 0) else if (strcmp (mime, "audio/x-mp3") == 0)
factory = g_strdup ("mad"); factory = g_strdup ("mad");
else if (strcmp (mime, "audio/x-wav") == 0) else if (strcmp (mime, "audio/x-wav") == 0)
factory = g_strdup ("wavparse"); factory = g_strdup ("wavparse");

View file

@ -24,7 +24,7 @@
static GstCaps* mp3_type_find(GstBuffer *buf, gpointer private); static GstCaps* mp3_type_find(GstBuffer *buf, gpointer private);
static GstTypeDefinition mp3type_definitions[] = { 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 }, { NULL, NULL, NULL, NULL },
}; };
@ -92,7 +92,7 @@ mp3_type_find(GstBuffer *buf, gpointer private)
return NULL; return NULL;
done: done:
caps = gst_caps_new ("mp3_type_find", "audio/mp3", NULL); caps = gst_caps_new ("mp3_type_find", "audio/x-mp3", NULL);
return caps; return caps;
} }

View file

@ -42,7 +42,7 @@ mp3_src_factory (void)
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
gst_caps_new ( gst_caps_new (
"mp3parse_src", "mp3parse_src",
"audio/mp3", "audio/x-mp3",
/* /*
gst_props_new ( gst_props_new (
"layer", GST_PROPS_INT_RANGE (1, 3), "layer", GST_PROPS_INT_RANGE (1, 3),
@ -63,7 +63,7 @@ mp3_sink_factory (void)
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
gst_caps_new ( gst_caps_new (
"mp3parse_sink", "mp3parse_sink",
"audio/mp3", "audio/x-mp3",
NULL), NULL),
NULL); NULL);
}; };

View file

@ -64,7 +64,7 @@ GST_PAD_TEMPLATE_FACTORY (audio_factory,
GST_PAD_SOMETIMES, GST_PAD_SOMETIMES,
GST_CAPS_NEW ( GST_CAPS_NEW (
"mpeg_demux_audio", "mpeg_demux_audio",
"audio/mp3", "audio/x-mp3",
NULL NULL
) )
); );