summaryrefslogtreecommitdiff
path: root/inc/lib/webm/README.md
diff options
context:
space:
mode:
authorMichael Walker <mike@barrucadu.co.uk>2015-09-12 21:03:54 +0100
committerMichael Walker <mike@barrucadu.co.uk>2015-09-12 21:03:54 +0100
commit166ba2a0a205c88bdb8fcc6fc538a0bdc01b60d9 (patch)
tree5a7293c0d78804f72e253e385d015162e029777b /inc/lib/webm/README.md
parent05c569e656070f086de49d24749d4b18916975da (diff)
parent844b26216614d953ee8521838f1030ad59d735ec (diff)
Merge remote-tracking branch 'vichan/master'
Diffstat (limited to 'inc/lib/webm/README.md')
-rw-r--r--inc/lib/webm/README.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/inc/lib/webm/README.md b/inc/lib/webm/README.md
index dc3394c9..d1c2a52a 100644
--- a/inc/lib/webm/README.md
+++ b/inc/lib/webm/README.md
@@ -30,6 +30,13 @@ If you have an [FFmpeg](https://www.ffmpeg.org/) binary on your server and you w
$config['webm']['ffmpeg_path'] = '/path/to/ffmeg';
$config['webm']['ffprobe_path'] = '/path/to/ffprobe';
+MP4 support
+-----------
+
+MP4 support is available only if you use FFmpeg thumbnailing (see above).
+
+ $config['allowed_ext_files'][] = 'mp4';
+
License
-------