From 64428495195b5ee605d3c65cf6e557e2ff96169a Mon Sep 17 00:00:00 2001 From: fengyu Date: Tue, 12 Aug 2014 21:46:33 +0800 Subject: [PATCH] set FFMPEG and FFMPEG_VERSION gracefully --- src/you_get/processor/ffmpeg.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/you_get/processor/ffmpeg.py b/src/you_get/processor/ffmpeg.py index ff33c9d7..ae169fc4 100644 --- a/src/you_get/processor/ffmpeg.py +++ b/src/you_get/processor/ffmpeg.py @@ -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