Drop the unofficial extension prefix for MPEG and MPEG-TS formats
authorFlorent Le Coz <florent.lecoz@arkena.com>
Sat, 29 Nov 2014 16:53:47 +0000 (17:53 +0100)
committerVittorio Giovara <vittorio.giovara@gmail.com>
Tue, 2 Dec 2014 15:28:22 +0000 (15:28 +0000)
As per the RFCs:
http://tools.ietf.org/html/rfc3555#page-38
http://tools.ietf.org/html/rfc3003

CC: libav-stable@libav.org
libavformat/mp3enc.c
libavformat/mpegtsenc.c
libavformat/rawenc.c

index bb96039..9cff9d3 100644 (file)
@@ -435,7 +435,7 @@ static int mp3_write_trailer(struct AVFormatContext *s)
 AVOutputFormat ff_mp2_muxer = {
     .name              = "mp2",
     .long_name         = NULL_IF_CONFIG_SMALL("MP2 (MPEG audio layer 2)"),
-    .mime_type         = "audio/x-mpeg",
+    .mime_type         = "audio/mpeg",
     .extensions        = "mp2,m2a,mpa",
     .audio_codec       = AV_CODEC_ID_MP2,
     .video_codec       = AV_CODEC_ID_NONE,
@@ -577,7 +577,7 @@ static int mp3_write_header(struct AVFormatContext *s)
 AVOutputFormat ff_mp3_muxer = {
     .name              = "mp3",
     .long_name         = NULL_IF_CONFIG_SMALL("MP3 (MPEG audio layer 3)"),
-    .mime_type         = "audio/x-mpeg",
+    .mime_type         = "audio/mpeg",
     .extensions        = "mp3",
     .priv_data_size    = sizeof(MP3Context),
     .audio_codec       = AV_CODEC_ID_MP3,
index d49e6e2..8fa1c3e 100644 (file)
@@ -1269,7 +1269,7 @@ static const AVClass mpegts_muxer_class = {
 AVOutputFormat ff_mpegts_muxer = {
     .name           = "mpegts",
     .long_name      = NULL_IF_CONFIG_SMALL("MPEG-TS (MPEG-2 Transport Stream)"),
-    .mime_type      = "video/x-mpegts",
+    .mime_type      = "video/MP2T",
     .extensions     = "ts,m2t,m2ts,mts",
     .priv_data_size = sizeof(MpegTSWrite),
     .audio_codec    = AV_CODEC_ID_MP2,
index eb50626..5d61646 100644 (file)
@@ -222,7 +222,7 @@ AVOutputFormat ff_mlp_muxer = {
 AVOutputFormat ff_mpeg1video_muxer = {
     .name              = "mpeg1video",
     .long_name         = NULL_IF_CONFIG_SMALL("raw MPEG-1 video"),
-    .mime_type         = "video/x-mpeg",
+    .mime_type         = "video/mpeg",
     .extensions        = "mpg,mpeg,m1v",
     .audio_codec       = AV_CODEC_ID_NONE,
     .video_codec       = AV_CODEC_ID_MPEG1VIDEO,