aboutsummaryrefslogtreecommitdiff
path: root/lib/libUPnP
diff options
context:
space:
mode:
authorJoakim Plate <elupus@ecce.se>2012-09-25 23:32:48 +0200
committermontellese <montellese@xbmc.org>2014-05-17 09:53:08 +0200
commit0b4a39723d3476c8a279a787660065ac1a64767a (patch)
tree1f73bd918952426531f1e2e13570eff4738bdb0e /lib/libUPnP
parent883f4f02d741317f5c8c6866d38b4b78dd79adf1 (diff)
platinum: report and support proper mimetypes for matroska
Diffstat (limited to 'lib/libUPnP')
-rw-r--r--lib/libUPnP/Neptune/Source/Core/NptHttp.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/libUPnP/Neptune/Source/Core/NptHttp.cpp b/lib/libUPnP/Neptune/Source/Core/NptHttp.cpp
index 132746a6d0..1700afca69 100644
--- a/lib/libUPnP/Neptune/Source/Core/NptHttp.cpp
+++ b/lib/libUPnP/Neptune/Source/Core/NptHttp.cpp
@@ -2779,12 +2779,14 @@ NPT_HttpFileRequestHandler_DefaultFileTypeMap[] = {
{"aif", "audio/x-aiff"},
{"aifc", "audio/x-aiff"},
{"aiff", "audio/x-aiff"},
+ {"mka", "audio/x-matroska"},
{"mpa", "audio/mpeg"},
{"mp2", "audio/mpeg"},
{"mp3", "audio/mpeg"},
{"m4a", "audio/mp4"},
{"wma", "audio/x-ms-wma"},
{"wav", "audio/x-wav"},
+ {"mkv", "video/x-matroska"},
{"mpeg", "video/mpeg"},
{"mpg", "video/mpeg"},
{"mp4", "video/mp4"},
@@ -2797,6 +2799,7 @@ NPT_HttpFileRequestHandler_DefaultFileTypeMap[] = {
{"wtv", "video/x-ms-wmv"},
{"asf", "video/x-ms-asf"},
{"mkv", "video/x-matroska"},
+ {"mk3d", "video/x-matroska-3d"},
{"flv", "video/x-flv"},
{"avi", "video/x-msvideo"},
{"divx", "video/x-msvideo"},