aboutsummaryrefslogtreecommitdiffstats
path: root/admin/include
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2016-02-23 13:50:52 +0100
committerplegall <plg@piwigo.org>2016-02-23 13:50:52 +0100
commitbe671c140108be5c1861e5969efdf9bad597968e (patch)
tree3a7b617cc7ec78c201590577352af9a371eabc99 /admin/include
parent01d923bcb0bf0dfd6b51e15fcfb6975b69d6ab0a (diff)
fixes #322, add {m4v,ogg,ogv,webm,webmv} for ffmpeg on upload
Diffstat (limited to 'admin/include')
-rw-r--r--admin/include/functions_upload.inc.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/include/functions_upload.inc.php b/admin/include/functions_upload.inc.php
index 17e78a200..900612fdd 100644
--- a/admin/include/functions_upload.inc.php
+++ b/admin/include/functions_upload.inc.php
@@ -535,7 +535,7 @@ function upload_file_video($representative_ext, $file_path)
$ffmpeg_video_exts = array( // extensions tested with FFmpeg
'wmv','mov','mkv','mp4','mpg','flv','asf','xvid','divx','mpeg',
- 'avi','rm',
+ 'avi','rm', 'm4v', 'ogg', 'ogv', 'webm', 'webmv',
);
if (!in_array(strtolower(get_extension($file_path)), $ffmpeg_video_exts))