summaryrefslogtreecommitdiff
path: root/libavformat/mpegtsenc.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/mpegtsenc.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/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 73026a023b..f773019660 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -1393,7 +1393,7 @@ static int mpegts_write_end(AVFormatContext *s)
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,