samsung mkv

--- xbmc/utils/Mime.cpp.original        2013-08-24 23:49:27.821473202 +0300
+++ xbmc/utils/Mime.cpp 2013-08-24 23:49:47.598258932 +0300
@@ -235,7 +235,7 @@
   mimeTypes.insert(pair<string, string>("mjf",       "audio/x-vnd.audioexplosion.mjuicemediafile"));
   mimeTypes.insert(pair<string, string>("mjpg",      "video/x-motion-jpeg"));
   mimeTypes.insert(pair<string, string>("mka",       "audio/x-matroska"));
-  mimeTypes.insert(pair<string, string>("mkv",       "video/x-matroska"));
+  mimeTypes.insert(pair<string, string>("mkv",       "video/x-mkv"));
   mimeTypes.insert(pair<string, string>("mm",        "application/x-meme"));
   mimeTypes.insert(pair<string, string>("mme",       "application/base64"));
   mimeTypes.insert(pair<string, string>("mod",       "audio/mod"));
--- xbmc/network/upnp/UPnPRenderer.cpp.original 2013-08-25 00:01:59.220277796 +0300
+++ xbmc/network/upnp/UPnPRenderer.cpp  2013-08-25 00:02:30.929931420 +0300
@@ -133,7 +133,7 @@
         ",http-get:*:video/BMPEG:*"
         ",http-get:*:video/xvid:*"
         ",http-get:*:video/x-divx:*"
-        ",http-get:*:video/x-matroska:*"
+        ",http-get:*:video/x-mkv:*"
         ",http-get:*:video/x-ms-wmv:*"
         ",http-get:*:video/x-ms-avi:*"
         ",http-get:*:video/x-flv:*"

--- lib/libUPnP/Platinum/Source/Core/PltProtocolInfo.cpp.original       2013-08-25 00:05:06.419233196 +0300
+++ lib/libUPnP/Platinum/Source/Core/PltProtocolInfo.cpp        2013-08-25 00:05:26.759011064 +0300
@@ -97,7 +97,7 @@
     {"video/x-ms-wmv", "DLNA.ORG_PN=WMVHIGH_BASE;DLNA.ORG_OP=01;DLNA.ORG_CI=0;DLNA.ORG_FLAGS=01500000000000000000000000000000"},
     {"video/x-msvideo","DLNA.ORG_PN=AVI;DLNA.ORG_OP=01;DLNA.ORG_CI=0;DLNA.ORG_FLAGS=01500000000000000000000000000000"},
     {"video/x-ms-asf", "DLNA.ORG_OP=01;DLNA.ORG_CI=0;DLNA.ORG_FLAGS=01500000000000000000000000000000"},
-    {"video/x-matroska","DLNA.ORG_OP=01;DLNA.ORG_CI=0"},
+    {"video/x-mkv","DLNA.ORG_OP=01;DLNA.ORG_CI=0"},
     {"video/x-flv",    "DLNA.ORG_OP=01;DLNA.ORG_CI=0"},
 };
--- lib/libUPnP/Neptune/Source/Core/NptHttp.cpp.original        2013-08-25 00:06:56.011036378 +0300
+++ lib/libUPnP/Neptune/Source/Core/NptHttp.cpp 2013-08-25 00:07:34.440616720 +0300
@@ -2887,7 +2887,7 @@
     {"m4a",  "audio/mp4"},
     {"wma",  "audio/x-ms-wma"},
     {"wav",  "audio/x-wav"},
-    {"mkv",  "video/x-matroska"},
+    {"mkv",  "video/x-mkv"},
     {"mpeg", "video/mpeg"},
     {"mpg",  "video/mpeg"},
     {"mp4",  "video/mp4"},
@@ -2899,7 +2899,7 @@
     {"wmv",  "video/x-ms-wmv"},
     {"wtv",  "video/x-ms-wmv"},
     {"asf",  "video/x-ms-asf"},
-    {"mkv",  "video/x-matroska"},
+    {"mkv",  "video/x-mkv"},
     {"mk3d", "video/x-matroska-3d"},
     {"flv",  "video/x-flv"},
     {"avi",  "video/x-msvideo"},

--- lib/ffmpeg/libavformat/matroskaenc.c.original       2013-08-25 00:08:28.761023563 +0300
+++ lib/ffmpeg/libavformat/matroskaenc.c        2013-08-25 00:08:52.269766862 +0300
@@ -1299,7 +1299,7 @@
 AVOutputFormat ff_matroska_muxer = {
     .name              = "matroska",
     .long_name         = NULL_IF_CONFIG_SMALL("Matroska file format"),
-    .mime_type         = "video/x-matroska",
+    .mime_type         = "video/x-mkv",
     .extensions        = "mkv",
     .priv_data_size    = sizeof(MatroskaMuxContext),
 #if CONFIG_LIBVORBIS_ENCODER