diff -up chromium-50.0.2661.11/media/base/mime_util.cc.matroska-avi chromium-50.0.2661.11/media/base/mime_util.cc
diff -up chromium-50.0.2661.11/media/base/mime_util_internal.cc.matroska-avi chromium-50.0.2661.11/media/base/mime_util_internal.cc
--- chromium-50.0.2661.11/media/base/mime_util_internal.cc.matroska-avi	2016-03-03 00:01:00.000000000 +0100
+++ chromium-50.0.2661.11/media/base/mime_util_internal.cc	2016-03-06 04:30:29.324265656 +0100
@@ -92,6 +92,8 @@ static const MediaFormat kFormatCodecMap
     // Note: Theora is not supported on Android and will be rejected during the
     // call to IsCodecSupportedOnPlatform().
     {"application/ogg", COMMON, "opus,theora,vorbis"},
+    { "video/x-matroska", COMMON, "avc1.42E00A,avc1.4D400A,avc1.64000A," "mp4a.66,mp4a.67,mp4a.68,mp4a.69,mp4a.6B,mp4a.40.2,mp4a.40.5" ",opus,vorbis,vp8,vp8.0,vp9,vp9.0,ac-3,ec-3,dts,mp3,mp2" },
+    { "audio/x-matroska", COMMON, "mp4a.66,mp4a.67,mp4a.68,mp4a.69,mp4a.6B,mp4a.40.2,mp4a.40.5" ",opus,vorbis,ac-3,ec-3,dts,mp3,mp2" },
 #if defined(USE_PROPRIETARY_CODECS)
     {"audio/mpeg", PROPRIETARY, "mp3"},
     {"audio/mp3", PROPRIETARY, ""},
@@ -103,6 +105,7 @@ static const MediaFormat kFormatCodecMap
     {"audio/x-m4a", PROPRIETARY, kMP4AudioCodecsExpression},
     {"video/mp4", PROPRIETARY, kMP4VideoCodecsExpression},
     {"video/x-m4v", PROPRIETARY, kMP4VideoCodecsExpression},
+    { "video/x-msvideo", PROPRIETARY, "avc1.42E00A,avc1.4D400A,avc1.64000A," "mp4a.66,mp4a.67,mp4a.68,mp4a.69,mp4a.6B,mp4a.40.2,mp4a.40.5" ",mp4v.20.9,mp4v.20.240,ac-3,ec-3,dts,mp3,mp2"},
 #if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER)
     {"video/mp2t", PROPRIETARY, kMP4VideoCodecsExpression},
 #endif
@@ -158,7 +161,11 @@ static const CodecIDMappings kUnambiguou
     {"vp8.0", MimeUtil::VP8},
     {"vp9", MimeUtil::VP9},
     {"vp9.0", MimeUtil::VP9},
-    {"theora", MimeUtil::THEORA}};
+    {"theora", MimeUtil::THEORA},
+    {"dts", MimeUtil::DTS},
+    {"mp2", MimeUtil::MP2},
+    {"mp4v.20.9", MimeUtil::MPEG4_SP},
+    {"mp4v.20.240", MimeUtil::MPEG4_ASP}};
 
 // List of codec IDs that are ambiguous and don't provide
 // enough information to determine the codec and profile.
@@ -617,6 +624,9 @@ bool MimeUtil::IsCodecProprietary(Codec
     case MPEG4_AAC_SBR_PS_v2:
     case H264:
     case HEVC_MAIN:
+    case DTS:
+    case MPEG4_SP:
+    case MPEG4_ASP:
       return true;
 
     case PCM:
diff -up chromium-50.0.2661.11/media/base/mime_util_internal.h.matroska-avi chromium-50.0.2661.11/media/base/mime_util_internal.h
--- chromium-50.0.2661.11/media/base/mime_util_internal.h.matroska-avi	2016-03-03 00:01:00.000000000 +0100
+++ chromium-50.0.2661.11/media/base/mime_util_internal.h	2016-03-06 04:33:13.251208189 +0100
@@ -43,7 +43,11 @@ class MEDIA_EXPORT MimeUtil {
     VP8,
     VP9,
     THEORA,
-    LAST_CODEC = THEORA
+    DTS,
+    MP2,
+    MPEG4_SP,
+    MPEG4_ASP,
+    LAST_CODEC = MPEG4_ASP
   };
 
   // Platform configuration structure.  Controls which codecs are supported at
diff -up chromium-50.0.2661.11/net/base/mime_util.cc.matroska-avi chromium-50.0.2661.11/net/base/mime_util.cc
--- chromium-50.0.2661.11/net/base/mime_util.cc.matroska-avi	2016-02-24 00:02:01.000000000 +0100
+++ chromium-50.0.2661.11/net/base/mime_util.cc	2016-03-06 04:24:07.643370714 +0100
@@ -78,6 +78,9 @@ static const MimeInfo kPrimaryMappings[]
     {"audio/webm", "webm"},
     {"audio/wav", "wav"},
     {"audio/flac", "flac"},
+    {"video/x-matroska", "mkv"},
+    {"audio/x-matroska", "mkv"},
+    {"video/x-msvideo", "avi"},
     {"application/xhtml+xml", "xhtml,xht,xhtm"},
     {"application/x-chrome-extension", "crx"},
     {"multipart/related", "mhtml,mht"}};
@@ -425,6 +428,7 @@ static const char* const kStandardAudioT
   "audio/vorbis",
   "audio/wav",
   "audio/webm",
+  "audio/x-matroska",
   "audio/x-m4a",
   "audio/x-ms-wma",
   "audio/vnd.rn-realaudio",
@@ -442,6 +446,7 @@ static const char* const kStandardVideoT
   "video/webm",
   "video/x-dv",
   "video/x-m4v",
+  "video/x-matroska",
   "video/x-mpeg",
   "video/x-ms-asf",
   "video/x-ms-wmv"