diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-11-16 11:02:22 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-11-16 11:02:22 +0100 |
| commit | 1c0ab9ed4b40587b525c6a22d1370b41993ffd5c (patch) | |
| tree | ef72b7badc180878ae605533feb9eee0522419a5 /application | |
| parent | ad70b9988e5581229efde818715ba4a201502a39 (diff) | |
| parent | 58d6854ad29b97061a1eb2fbd96ac57c29a13a3a (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.php | 3 |
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', |