[doc] update doc about video support

This commit is contained in:
Adrien Beudin 2016-05-19 10:41:29 +02:00
parent 394eb9cb73
commit dc288b4173
2 changed files with 30 additions and 15 deletions

View File

@ -80,12 +80,29 @@ Prosopopée can use ffmpeg or libav and if you want you can customize the settin
settings: settings:
ffmpeg: ffmpeg:
binary: "ffmpeg" binary: "ffmpeg",
loglevel: "error" loglevel: "error",
format: "webm" format: "webm",
resolution: "1280x720" resolution: "1280x720",
bitrate: "3900k" vbitrate: "3900k",
preselect: "libvpx-720p" abitrate: "100k",
audio: "libvorbis",
video: "libvpx",
other: "-qmin 10 -qmax 42 -maxrate 500k -bufsize 1500k"
The meaning of the currently supported FFMEG or LIBAV's settings is as follows :
* `binary` the binary you will use for convert the video (ffmpeg or avconv)
* `loglevel` Set the logging level used by the library
* `format` Force input or output file format
* `resolution` Set frame size
* `vbitrate` Set video bitrate
* `abitrate` Set audio bitrate
* `audio` Set the audio codec
* `video` Set the video codec
* `other` Set different options if you need more
Themes Themes
~~~~~~ ~~~~~~

View File

@ -208,28 +208,26 @@ Exemple for pictures-group::
- type: pictures-group - type: pictures-group
images: images:
- -
- name: VID_20160312_174602.mp4 - name: video.mp4
type: video type: video
- snapseed-06-02.jpeg - image1.jpeg
- name: snapseed-04.jpeg - image2.jpeg
text: plop2
- snapseed-05.jpeg
- snapseed-07.jpeg
- -
- snapseed-01.jpeg - image3.jpeg
- image4.jpeg
Exemple for bordered-picture:: Exemple for bordered-picture::
- type: bordered-picture - type: bordered-picture
image: image:
name: VID_20160312_174602.mp4 name: video.mp4
type: video type: video
And for full-picture:: And for full-picture::
- type: full-picture - type: full-picture
image: image:
name: VID_20160312_174602.mp4 name: video.mp4
type: video type: video
text: text:
title: Title Text title: Title Text