From bb6955f8e256bbccb4d245c50f39a23e51f11ba5 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Tue, 3 May 2016 12:12:11 +0200 Subject: [PATCH] update docs --- docs/changelog.rst | 3 ++- docs/configuration.rst | 14 ++++++++++++++ docs/install.rst | 8 ++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index a96a996..4475e7f 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -4,7 +4,8 @@ Changelog 0.4 (unreleased) * RSS https://prosopopee.readthedocs.org/en/latest/configuration.html#rss by beudbeud - * possibility to use video + * possibility to use video in section + * add lazyload for pics 0.3.1 (2016-04-13) diff --git a/docs/configuration.rst b/docs/configuration.rst index b60bd9c..b3497a4 100644 --- a/docs/configuration.rst +++ b/docs/configuration.rst @@ -73,6 +73,20 @@ The meaning of the currently supported GraphicsMagick's settings is as follows : Any GraphicsMagick setting can be customized on a per-image basis (either `cover` or `image`, see below). +Video convertor +~~~~~~~~~~~~~~~ + +Prosopopée can use ffmpeg or libav and if you want you can customize the settings:: + + settings: + ffmpeg: + binary: "ffmpeg" + loglevel: "panic" + format: "webm" + resolution: "1280x720" + bitrate: "3900k" + preselect: "libvpx-720p" + Themes ~~~~~~ diff --git a/docs/install.rst b/docs/install.rst index 7d94e6d..4f1732b 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -12,6 +12,14 @@ Gallery building needs graphicsmagick library:: apt-get install graphicsmagick ffmpeg +An video convertor like ffmpeg:: + + apt-get install ffmpeg + +or:: + + apt-get install libav-tools + Installation in virtualenv --------------------------