set ffmpeg fallback version to 1.0

This commit is contained in:
FengYu 2014-08-12 21:10:21 +08:00
parent eaf59fc745
commit f92af54d28

View File

@ -13,12 +13,16 @@ def get_usable_ffmpeg(cmd):
try: try:
version = [int(i) for i in vers[2].split('.')] version = [int(i) for i in vers[2].split('.')]
except: except:
version = [2, 0] version = [1, 0]
return cmd, version return cmd, version
except: except:
return None, None return None
FFMPEG, FFMPEG_VERSION = get_usable_ffmpeg('ffmpeg') or get_usable_ffmpeg('avconv') 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
def has_ffmpeg_installed(): def has_ffmpeg_installed():
return FFMPEG is not None return FFMPEG is not None