mirror of
https://github.com/soimort/you-get.git
synced 2025-02-03 00:33:58 +03:00
Merge branch 'abcfy2-develop' into develop
This commit is contained in:
commit
fb83330e2f
@ -7,13 +7,18 @@ def get_usable_ffmpeg(cmd):
|
||||
try:
|
||||
p = subprocess.Popen([cmd, '-version'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||
out, err = p.communicate()
|
||||
vers = str(out, 'utf-8').split('\n')[0].split(' ')
|
||||
vers = str(out, 'utf-8').split('\n')[0].split()
|
||||
assert (vers[0] == 'ffmpeg' and vers[2][0] > '0') or (vers[0] == 'avconv')
|
||||
return cmd, [int(i) for i in vers[2].split('.')]
|
||||
#if the version is strange like 'N-1234-gd1111', set version to 2.0
|
||||
try:
|
||||
version = [int(i) for i in vers[2].split('.')]
|
||||
except:
|
||||
version = [1, 0]
|
||||
return cmd, version
|
||||
except:
|
||||
return None
|
||||
|
||||
FFMPEG, FFMPEG_VERSION = get_usable_ffmpeg('ffmpeg') or get_usable_ffmpeg('avconv')
|
||||
FFMPEG, FFMPEG_VERSION = get_usable_ffmpeg('ffmpeg') or get_usable_ffmpeg('avconv') or (None, None)
|
||||
|
||||
def has_ffmpeg_installed():
|
||||
return FFMPEG is not None
|
||||
|
Loading…
Reference in New Issue
Block a user