diff options
| author | MaZderMind <git@mazdermind.de> | 2016-09-28 21:21:23 +0200 |
|---|---|---|
| committer | MaZderMind <git@mazdermind.de> | 2016-09-28 21:21:23 +0200 |
| commit | 12ffd2155cbec3d94e8fc2df32532de016005a5c (patch) | |
| tree | 19059647c7ec1c4922caecb9b80d77d4ea254370 /voctocore/default-config.ini | |
| parent | f13be7d7cddc1085a763b63e4b0db9aeee478277 (diff) | |
| parent | 7d206f56eb557585986bd259e32293a81899c853 (diff) | |
Merge branch 'previews-vaapi'
Diffstat (limited to 'voctocore/default-config.ini')
| -rw-r--r-- | voctocore/default-config.ini | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/voctocore/default-config.ini b/voctocore/default-config.ini index 31a49ff..4c85abb 100644 --- a/voctocore/default-config.ini +++ b/voctocore/default-config.ini @@ -62,9 +62,13 @@ mix_out=10000 enabled=false deinterlace=false +; use vaapi to encode the previews, can be h264, mpeg2 or jpeg (BUT ONLY h264 IS TESTED) +; not all encoders are available on all CPUs +;vaapi=h264 + ; default to mix-videocaps, only applicable if enabled=true ; you can change the framerate and the width/height, but nothing else -videocaps=video/x-raw,width=1024,height=576,framerate=25/1 +;videocaps=video/x-raw,width=1024,height=576,framerate=25/1 [stream-blanker] enabled=true |