diff options
| author | Florent Le Coz <florent.lecoz@arkena.com> | 2014-11-29 17:53:47 +0100 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-12-02 15:28:22 +0000 |
| commit | 2e0935965b824bc641b7e0bafafcbb1e36027f79 (patch) | |
| tree | 8bb36b4135554f3eff216761f099122081e25d74 /libavformat/mp3enc.c | |
| parent | 7319a47c7e7931ebf8f475cc2cffc7bcd333acee (diff) | |
Drop the unofficial extension prefix for MPEG and MPEG-TS formats
As per the RFCs:
http://tools.ietf.org/html/rfc3555#page-38
http://tools.ietf.org/html/rfc3003
CC: libav-stable@libav.org
Diffstat (limited to 'libavformat/mp3enc.c')
| -rw-r--r-- | libavformat/mp3enc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c index bb960396c7..9cff9d33e7 100644 --- a/libavformat/mp3enc.c +++ b/libavformat/mp3enc.c @@ -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, |