From fdcb2873e1c898cf26216f7e80d95d03387ba55b Mon Sep 17 00:00:00 2001
From: Florent Le Coz <florent.lecoz@arkena.com>
Date: Wed, 21 May 2014 15:27:09 +0200
Subject: 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
---
 libavformat/rawenc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libavformat/rawenc.c')

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,
-- 
cgit v1.2.3