提交 64428495 编写于 作者: F fengyu

set FFMPEG and FFMPEG_VERSION gracefully

上级 f92af54d
......@@ -18,11 +18,7 @@ def get_usable_ffmpeg(cmd):
except:
return None
get_usable_ffmpeg_result = get_usable_ffmpeg('ffmpeg') or get_usable_ffmpeg('avconv')
if get_usable_ffmpeg_result:
FFMPEG, FFMPEG_VERSION = get_usable_ffmpeg_result
else:
FFMPEG, FFMPEG_VERSION = None, None
FFMPEG, FFMPEG_VERSION = get_usable_ffmpeg('ffmpeg') or get_usable_ffmpeg('avconv') or (None, None)
def has_ffmpeg_installed():
return FFMPEG is not None
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册