From 3a41c3d22c52aa5a08b63fdc1335d6b1d1b0b4fa Mon Sep 17 00:00:00 2001 From: Mort Yao Date: Fri, 10 Aug 2018 03:05:14 +0200 Subject: [PATCH] [processor.ffmpeg] shut the f up --- src/you_get/processor/ffmpeg.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/you_get/processor/ffmpeg.py b/src/you_get/processor/ffmpeg.py index 1e3bd7eb..a18188da 100755 --- a/src/you_get/processor/ffmpeg.py +++ b/src/you_get/processor/ffmpeg.py @@ -22,12 +22,10 @@ def get_usable_ffmpeg(cmd): out, err = p.communicate() vers = str(out, 'utf-8').split('\n')[0].split() assert (vers[0] == 'ffmpeg' and vers[2][0] > '0') or (vers[0] == 'avconv') - #set version to 1.0 for nightly build and print warning try: - version = [int(i) for i in vers[2].split('.')] + v = vers[2][1:] if vers[2][0] == 'n' else vers[2] + version = [int(i) for i in v.split('.')] except: - print('It seems that your ffmpeg is a nightly build.', file=sys.stderr) - print('Please switch to the latest stable if merging failed.', file=sys.stderr) version = [1, 0] return cmd, 'ffprobe', version except: