Merge pull request #4314 from MartijnKaijser/beta1
[vuplus_xbmc] / lib / libUPnP / patches / 0006-upnp-report-and-support-proper-mimetypes-for-matrosk.patch
1 From 404163dca7899d7dfb3b64d65b83adc7d9eeb173 Mon Sep 17 00:00:00 2001
2 From: Joakim Plate <elupus@ecce.se>
3 Date: Tue, 25 Sep 2012 23:32:48 +0200
4 Subject: [PATCH] upnp: report and support proper mimetypes for matroska
5
6 ---
7  lib/libUPnP/Neptune/Source/Core/NptHttp.cpp | 3 +++
8  1 file changed, 3 insertions(+)
9
10 diff --git a/lib/libUPnP/Neptune/Source/Core/NptHttp.cpp b/lib/libUPnP/Neptune/Source/Core/NptHttp.cpp
11 index a756fd8..07586f9 100644
12 --- a/lib/libUPnP/Neptune/Source/Core/NptHttp.cpp
13 +++ b/lib/libUPnP/Neptune/Source/Core/NptHttp.cpp
14 @@ -2880,12 +2880,14 @@ NPT_HttpFileRequestHandler_DefaultFileTypeMap[] = {
15      {"aif",  "audio/x-aiff"},
16      {"aifc", "audio/x-aiff"},
17      {"aiff", "audio/x-aiff"},
18 +    {"mka",  "audio/x-matroska"},
19      {"mpa",  "audio/mpeg"},
20      {"mp2",  "audio/mpeg"},
21      {"mp3",  "audio/mpeg"},
22      {"m4a",  "audio/mp4"},
23      {"wma",  "audio/x-ms-wma"},
24      {"wav",  "audio/x-wav"},
25 +    {"mkv",  "video/x-matroska"},
26      {"mpeg", "video/mpeg"},
27      {"mpg",  "video/mpeg"},
28      {"mp4",  "video/mp4"},
29 @@ -2898,6 +2900,7 @@ NPT_HttpFileRequestHandler_DefaultFileTypeMap[] = {
30      {"wtv",  "video/x-ms-wmv"},
31      {"asf",  "video/x-ms-asf"},
32      {"mkv",  "video/x-matroska"},
33 +    {"mk3d", "video/x-matroska-3d"},
34      {"flv",  "video/x-flv"},
35      {"avi",  "video/x-msvideo"},
36      {"divx", "video/x-msvideo"},
37 -- 
38 1.7.11.msysgit.0
39