From be671c140108be5c1861e5969efdf9bad597968e Mon Sep 17 00:00:00 2001 From: plegall Date: Tue, 23 Feb 2016 13:50:52 +0100 Subject: fixes #322, add {m4v,ogg,ogv,webm,webmv} for ffmpeg on upload --- admin/include/functions_upload.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'admin') 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)) -- cgit v1.2.3