summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-06-24 11:06:29 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-06-24 11:06:29 +0200
commit5c213539afe8aa5dcf2e134739cedd20eb76a80d (patch)
tree8f4ce47827ea806c38b7deb703302bcc718ec421 /lib
parentceb80ac123b26b033aac3f724da44a6f78c539ec (diff)
downloadnextcloud-server-5c213539afe8aa5dcf2e134739cedd20eb76a80d.tar.gz
nextcloud-server-5c213539afe8aa5dcf2e134739cedd20eb76a80d.zip
Update wmv and add mts and mt2s - fixes #17128 and owncloud/firewall#107
Diffstat (limited to 'lib')
-rw-r--r--lib/private/mimetypes.list.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/private/mimetypes.list.php b/lib/private/mimetypes.list.php
index e2b82b256e5..5f222cbd835 100644
--- a/lib/private/mimetypes.list.php
+++ b/lib/private/mimetypes.list.php
@@ -117,6 +117,8 @@ return array(
'mpg' => array('video/mpeg', null),
'mpo' => array('image/jpeg', null),
'msi' => array('application/x-msi', null),
+ 'mts' => ['video/MP2T', null],
+ 'mt2s' => ['video/MP2T', null],
'nef' => array('image/x-dcraw', null),
'numbers' => array('application/x-iwork-numbers-sffnumbers', null),
'odf' => array('application/vnd.oasis.opendocument.formula', null),
@@ -176,7 +178,7 @@ return array(
'wav' => array('audio/wav', null),
'webm' => array('video/webm', null),
'woff' => array('application/font-woff', null),
- 'wmv' => array('video/x-ms-asf', null),
+ 'wmv' => array('video/x-ms-wmv', null),
'xcf' => array('application/x-gimp', null),
'xla' => array('application/vnd.ms-excel', null),
'xlam' => array('application/vnd.ms-excel.addin.macroEnabled.12', null),