Merge remote-tracking branch 'refs/remotes/origin/master'

This commit is contained in:
Martinez 2016-03-16 11:31:17 +01:00
commit 55646352ec
2 changed files with 78 additions and 1 deletions

View file

@ -10,7 +10,7 @@ import tempfile
import time
import version
from aux import parse_fps, to_Path
from aux import parse_fps, to_Path, update_cfg_context
Command = over.core.cmd.Command
prefix = over.core.text.prefix
@ -45,6 +45,7 @@ if __name__ == '__main__':
main.add_option('video', 'str', 'x264', 'Video codec to use, either §mx265§/, §mx264§/, §mtheora§/, §mcopy§/ or §mdrop§/.', short_name='v')
main.add_option('video-preset', 'str', 'slow', 'Video encoding preset, if supported by the selected encoder.', short_name='P')
main.add_option('video-quality', 'float', 22, 'Video encoding quality (CRF). Use §m0§/-§m10§/ for Theora (§m0§/ being the lowest, §m5§/-§m7§/ is generally watchable) and §m0§/-§m51§/ for x264/5 (§m0§/ being lossless, §m18§/-§m28§/ is reasonable).', short_name='Q')
main.add_option('context', 'bool', True, 'Use .over-video file in CWD, if available, to remember encoding parameters per-directory.', short_name='C')
main.add_option('normalize', 'bool', True, 'Normalize the audio track.', short_name='n')
main.add_option('normalize-target', 'float', -20.0, 'Target mean volume to target.')
main.add_option('normalize-override', 'float', 0.0, 'Volume correction to use instead of computing the required value in a (lengthy) pre-pass.', short_name='N', use_cfg_file=False)
@ -66,6 +67,9 @@ if __name__ == '__main__':
video_words = []
files.container = 'mkv'
if main.cfg.context:
update_cfg_context(main)
if main.cfg.audio in ('copy', 'drop'):
audio_words.append('§c%s§/' %(main.cfg.audio))
else: