summaryrefslogtreecommitdiff
path: root/libavformat/rawenc.c
diff options
context:
space:
mode:
authorFlorent Le Coz <florent.lecoz@arkena.com>2014-11-29 17:53:47 +0100
committerVittorio Giovara <vittorio.giovara@gmail.com>2014-12-02 15:28:22 +0000
commit2e0935965b824bc641b7e0bafafcbb1e36027f79 (patch)
tree8bb36b4135554f3eff216761f099122081e25d74 /libavformat/rawenc.c
parent7319a47c7e7931ebf8f475cc2cffc7bcd333acee (diff)
downloadffmpeg-2e0935965b824bc641b7e0bafafcbb1e36027f79.tar.gz
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/rawenc.c')
-rw-r--r--libavformat/rawenc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c
index eb50626100..5d6164656d 100644
--- a/libavformat/rawenc.c
+++ b/libavformat/rawenc.c
@@ -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,