From: Jaime Marquínez Ferrándiz Date: Wed, 27 Aug 2014 13:49:07 +0000 (+0200) Subject: [downloader/hls] Use check_executable X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=3c765c68c48ccee617ea777214327022e01f715a;p=youtube-dl [downloader/hls] Use check_executable --- diff --git a/youtube_dl/downloader/hls.py b/youtube_dl/downloader/hls.py index 4082e481a..40d854aa3 100644 --- a/youtube_dl/downloader/hls.py +++ b/youtube_dl/downloader/hls.py @@ -3,6 +3,7 @@ import subprocess from .common import FileDownloader from ..utils import ( + check_executable, encodeFilename, ) @@ -19,11 +20,8 @@ class HlsFD(FileDownloader): encodeFilename(tmpfilename, for_subprocess=True)] for program in ['avconv', 'ffmpeg']: - try: - subprocess.call([program, '-version'], stdout=(open(os.path.devnull, 'w')), stderr=subprocess.STDOUT) + if check_executable(program, ['-version']): break - except (OSError, IOError): - pass else: self.report_error(u'm3u8 download detected but ffmpeg or avconv could not be found. Please install one.') cmd = [program] + args