From 7886d70be269d4c79cbfd67c1bb7be313ce221fa Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 16 Nov 2015 12:02:22 +0200 Subject: Merge pull request #4241 from suhindra/develop [ci skip] Added/updated MIME types for Flash Video --- application/config/mimes.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'application/config/mimes.php') 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', -- cgit v1.2.3-24-g4f1b