summaryrefslogtreecommitdiff
path: root/libavformat/mpegtsenc.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/mpegtsenc.c
parent7319a47c7e7931ebf8f475cc2cffc7bcd333acee (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/mpegtsenc.c')
-rw-r--r--libavformat/mpegtsenc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index d49e6e256d..8fa1c3e370 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -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,