Merge pull request #4241 from suhindra/develop

[ci skip] Added/updated MIME types for Flash Video
bcit-ci · Nov 16, 2015 · 1c0ab9e · 1c0ab9e
2 parents ad70b99 + 58d6854
commit 1c0ab9e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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',