Merge pull request #4241 from suhindra/develop
[ci skip] Added/updated MIME types for Flash Video
diff --git a/application/config/mimes.php b/application/config/mimes.php
index aa3b183..957dc05 100644
--- a/application/config/mimes.php
+++ b/application/config/mimes.php
@@ -137,7 +137,8 @@
'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',