prenex/magcms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[mod] blank line for lisibilit

Browse Source 
[mod] blank line for lisibilit
This commit is contained in:
Laurent Peuch 2016-05-04 09:59:05 +02:00
parent 26b78f7c5c
commit 9102a73b1e
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
prosopopee/prosopopee.py
View File

@ -181,8 +181,10 @@ class Image(object):
def main(): def main():
settings = yaml.safe_load(open("settings.yaml", "r")) settings = yaml.safe_load(open("settings.yaml", "r"))
if settings["settings"].get("ffmpeg"): if settings["settings"].get("ffmpeg"):
SETTINGS["ffmpeg"].update(settings["settings"]["ffmpeg"]) SETTINGS["ffmpeg"].update(settings["settings"]["ffmpeg"])
conv_video = settings["settings"]["ffmpeg"]["binary"] conv_video = settings["settings"]["ffmpeg"]["binary"]
else: else:
conv_video = "ffmpeg" conv_video = "ffmpeg"