Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorent Le Coz <florent.lecoz@arkena.com>2014-05-21 17:27:09 +0400
committerMichael Niedermayer <michaelni@gmx.at>2014-05-23 01:34:59 +0400
commitfdcb2873e1c898cf26216f7e80d95d03387ba55b (patch)
treee0a7385aa3eff7d219068483b0bd84716dd2b1dc /libavformat/rawenc.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/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 abd7e66978..8b50fe1f17 100644
--- a/libavformat/rawenc.c
+++ b/libavformat/rawenc.c
@@ -269,7 +269,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,