summaryrefslogtreecommitdiff
path: root/libavformat/mp3enc.c
diff options
context:
space:
mode:
authorFlorent Le Coz <florent.lecoz@arkena.com>2014-05-21 15:27:09 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-22 23:34:59 +0200
commitfdcb2873e1c898cf26216f7e80d95d03387ba55b (patch)
treee0a7385aa3eff7d219068483b0bd84716dd2b1dc /libavformat/mp3enc.c
parentc081ca851c9b84a41fafbce22c47a9b30b7bf8ad (diff)
Fix the mime types for MPEG and MPEG-TS formats
As per the RFCs: http://tools.ietf.org/html/rfc3555#page-38 http://tools.ietf.org/html/rfc3003
Diffstat (limited to 'libavformat/mp3enc.c')
-rw-r--r--libavformat/mp3enc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c
index eeaff1e883..43f7656314 100644
--- a/libavformat/mp3enc.c
+++ b/libavformat/mp3enc.c
@@ -384,7 +384,7 @@ static int query_codec(enum AVCodecID id, int std_compliance)
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,
@@ -526,7 +526,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,