From bbd50c4e6cf61427c8feede51b17630bb0995c29 Mon Sep 17 00:00:00 2001 From: Mort Yao Date: Wed, 17 Apr 2013 12:27:14 +0200 Subject: [PATCH] avoid using the libav fork of FFmpeg, as in #159 --- src/you_get/processor/ffmpeg.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/you_get/processor/ffmpeg.py b/src/you_get/processor/ffmpeg.py index 4b5d1db7..50172071 100644 --- a/src/you_get/processor/ffmpeg.py +++ b/src/you_get/processor/ffmpeg.py @@ -5,10 +5,14 @@ import subprocess def has_ffmpeg_installed(): try: - subprocess.call(['ffmpeg', '-loglevel', '0']) - return True + p = subprocess.Popen(['ffmpeg', '-version'], stdout=subprocess.PIPE) + out, err = p.communicate() + import re + assert re.search('Libav', str(out, 'utf-8').split('\n')[0]) is None except: return False + else: + return True def ffmpeg_convert_ts_to_mkv(files, output = 'output.mkv'): for file in files: