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

Update prosopopee.py

Browse Source
This commit is contained in:
abeudin 2016-05-11 13:31:42 +02:00
parent 4fc4868b06
commit 4c06078339
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
prosopopee/prosopopee.py
View File

@ -198,11 +198,11 @@ def main():
if os.system("which " + conv_video +" > /dev/null") != 0: if os.system("which " + conv_video +" > /dev/null") != 0:
if conv_video == "ffmpeg" and os.system("which avconv > /dev/null") == 0: if conv_video == "ffmpeg" and os.system("which avconv > /dev/null") == 0:
SETTINGS["ffmpeg"]["binary"] = "avconv" SETTINGS["ffmpeg"]["binary"] = "avconv"
warning("I couldn't locate ffmpeg but I could find avconv, switching to avconv for video conversion") warning("Video", "I couldn't locate ffmpeg but I could find avconv, switching to avconv for video conversion")
else: else:
warning("I can't locate the "+ conv_video +" binary, " warning("Video", "I can't locate the "+ conv_video +" binary, "
"please install the '" + conv_video + "' package.\n") "please install the '" + conv_video + "' package.\n")
warning("I won't be able to encode video and I will stop if I encounter a video to convert") warning("Video", "I won't be able to encode video and I will stop if I encounter a video to convert")
SETTINGS["ffmpeg"] = False SETTINGS["ffmpeg"] = False
error(os.path.exists(os.path.join(os.getcwd(), "settings.yaml")), "I can't find a " error(os.path.exists(os.path.join(os.getcwd(), "settings.yaml")), "I can't find a "