aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJoakim Plate <elupus@ecce.se>2012-09-25 23:32:48 +0200
committerJoakim Plate <elupus@ecce.se>2012-09-25 23:37:57 +0200
commit360f41d29a37f440f7b2ededa6d89398ec74a698 (patch)
treea8faaaf59edffd65b0fbdf012eb3e7ec9084d1c3 /lib
parenta653df7637f3da2b53de15ab14ffee3cc0aeb038 (diff)
upnp: report and support proper mimetypes for matroska
Diffstat (limited to 'lib')
-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 a756fd866b..07586f99ca 100644
--- a/lib/libUPnP/Neptune/Source/Core/NptHttp.cpp
+++ b/lib/libUPnP/Neptune/Source/Core/NptHttp.cpp
@@ -2880,12 +2880,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"},
@@ -2898,6 +2900,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"},