summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-11-16 11:02:22 +0100
committerAndrey Andreev <narf@devilix.net>2016-01-11 10:36:09 +0100
commit7886d70be269d4c79cbfd67c1bb7be313ce221fa (patch)
tree29da1bc8a43453be21a10447752229193397ad84 /application
parent803cc12107f687a8ff9a19427023122b2d6b7207 (diff)
Merge pull request #4241 from suhindra/develop
[ci skip] Added/updated MIME types for Flash Video
Diffstat (limited to 'application')
-rw-r--r--application/config/mimes.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php
index aa3b1836a..957dc05d8 100644
--- a/application/config/mimes.php
+++ b/application/config/mimes.php
@@ -137,7 +137,8 @@ return array(
'3gp' => array('video/3gp', 'video/3gpp'),
'mp4' => 'video/mp4',
'm4a' => 'audio/x-m4a',
- 'f4v' => 'video/mp4',
+ 'f4v' => array('video/mp4', 'video/x-f4v'),
+ 'flv' => 'video/x-flv',
'webm' => 'video/webm',
'aac' => 'audio/x-acc',
'm4u' => 'application/vnd.mpegurl',