set FFMPEG and FFMPEG_VERSION gracefully

This commit is contained in:
fengyu 2014-08-12 21:46:33 +08:00
parent f92af54d28
commit 6442849519

View File

@ -18,11 +18,7 @@ def get_usable_ffmpeg(cmd):
except: except:
return None return None
get_usable_ffmpeg_result = get_usable_ffmpeg('ffmpeg') or get_usable_ffmpeg('avconv') FFMPEG, FFMPEG_VERSION = get_usable_ffmpeg('ffmpeg') or get_usable_ffmpeg('avconv') or (None, None)
if get_usable_ffmpeg_result:
FFMPEG, FFMPEG_VERSION = get_usable_ffmpeg_result
else:
FFMPEG, FFMPEG_VERSION = None, None
def has_ffmpeg_installed(): def has_ffmpeg_installed():
return FFMPEG is not None return FFMPEG is not None