From aacc7128690fe060ab6c7e8fe5009d2893240176 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Fri, 10 Oct 2014 15:58:54 +0200 Subject: [PATCH] only parse avconv major version --- pandora/archive/extract.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pandora/archive/extract.py b/pandora/archive/extract.py index 10179dc6..b044207a 100644 --- a/pandora/archive/extract.py +++ b/pandora/archive/extract.py @@ -68,6 +68,10 @@ def avconv_version(): stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True) stdout, stderr = p.communicate() version = stderr.split(' ')[2].split('-')[0] + try: + version = int(version.split('.')[0]) + except: + pass return version def stream(video, target, profile, info, avconv=None, audio_track=0): @@ -206,7 +210,7 @@ def stream(video, target, profile, info, avconv=None, audio_track=0): '-qdiff', '4' ] ''' - if settings.AVCONV_VERSION >= '9': + if settings.AVCONV_VERSION >= 9: video_settings += [ '-vcodec', 'libx264', '-preset:v', 'medium',