From 9102a73b1e47543cf2524556da51eda166e1331e Mon Sep 17 00:00:00 2001 From: Laurent Peuch Date: Wed, 4 May 2016 09:59:05 +0200 Subject: [PATCH] [mod] blank line for lisibilit [mod] blank line for lisibilit --- prosopopee/prosopopee.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/prosopopee/prosopopee.py b/prosopopee/prosopopee.py index f70fcb6..692c5a5 100644 --- a/prosopopee/prosopopee.py +++ b/prosopopee/prosopopee.py @@ -181,8 +181,10 @@ class Image(object): def main(): settings = yaml.safe_load(open("settings.yaml", "r")) + if settings["settings"].get("ffmpeg"): SETTINGS["ffmpeg"].update(settings["settings"]["ffmpeg"]) + conv_video = settings["settings"]["ffmpeg"]["binary"] else: conv_video = "ffmpeg"