diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-11-06 15:04:33 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-11-06 15:06:35 +0100 |
| commit | ac66cab946334f76dac699dd67d25225e9b3548c (patch) | |
| tree | 829571bfbaad2a4adae9c43f3addb86e15e280c2 /application/config | |
| parent | 0139e6a4a99cbe9b0cc06f394fa12d5691193b72 (diff) | |
Merge pull request #4218 from schwemmer/develop
[ci skip] Added MIME types for JPEG2000
Diffstat (limited to 'application/config')
| -rw-r--r-- | application/config/mimes.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/application/config/mimes.php b/application/config/mimes.php index 1f591ba6b..aa3b1836a 100644 --- a/application/config/mimes.php +++ b/application/config/mimes.php @@ -77,6 +77,14 @@ return array( 'jpeg' => array('image/jpeg', 'image/pjpeg'), 'jpg' => array('image/jpeg', 'image/pjpeg'), 'jpe' => array('image/jpeg', 'image/pjpeg'), + 'jp2' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), + 'j2k' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), + 'jpf' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), + 'jpg2' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), + 'jpx' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), + 'jpm' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), + 'mj2' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), + 'mjp2' => array('image/jp2', 'video/mj2', 'image/jpx', 'image/jpm'), 'png' => array('image/png', 'image/x-png'), 'tiff' => 'image/tiff', 'tif' => 'image/tiff', |