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

[mod] fallback on avconv for video conversion

Browse Source
This commit is contained in:
Laurent Peuch 2016-05-04 10:45:26 +02:00
parent 35d2b54c8a
commit ddee3e85c2
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
prosopopee/prosopopee.py
View File

@ -196,10 +196,14 @@ def main():
"please install the 'graphicsmagick' package.\n") "please install the 'graphicsmagick' package.\n")
if os.system("which " + conv_video +" > /dev/null") != 0: if os.system("which " + conv_video +" > /dev/null") != 0:
warning("I can't locate the "+ conv_video +" binary, " if conv_video == "ffmpeg" and os.system("which avconv > /dev/null") == 0:
"please install the '" + conv_video + "' package.\n") SETTINGS["ffmpeg"]["binary"] = "avconv"
warning("I won't be able to encode video and I will stop if I encounter a video to convert") warning("I couldn't locate ffmpeg but I could find avconv, switching to avconv for video conversion")
SETTINGS["ffmpeg"] = False else:
warning("I can't locate the "+ conv_video +" binary, "
"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")
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 "
"settings.yaml in the current working directory") "settings.yaml in the current working directory")