From: Jaime Marquínez Ferrándiz Date: Sun, 10 Nov 2013 15:47:03 +0000 (+0100) Subject: Use avconv for downloading with m3u8 manifests if it's available (fixes #1735) X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=801dbbdffd9df57e4051e8fd01efbb6104f99c26;p=youtube-dl Use avconv for downloading with m3u8 manifests if it's available (fixes #1735) --- diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py index d0b3dd8fb..088f59586 100644 --- a/youtube_dl/FileDownloader.py +++ b/youtube_dl/FileDownloader.py @@ -381,16 +381,20 @@ class FileDownloader(object): self.report_destination(filename) tmpfilename = self.temp_name(filename) - args = ['ffmpeg', '-y', '-i', url, '-f', 'mp4', '-c', 'copy', - '-absf', 'aac_adtstoasc', tmpfilename] - # Check for ffmpeg first - try: - subprocess.call(['ffmpeg', '-h'], stdout=(open(os.path.devnull, 'w')), stderr=subprocess.STDOUT) - except (OSError, IOError): - self.report_error(u'm3u8 download detected but "%s" could not be run' % args[0] ) - return False + args = ['-y', '-i', url, '-f', 'mp4', '-c', 'copy', + '-bsf:a', 'aac_adtstoasc', tmpfilename] - retval = subprocess.call(args) + for program in ['avconv', 'ffmpeg']: + try: + subprocess.call([program, '-version'], stdout=(open(os.path.devnull, 'w')), stderr=subprocess.STDOUT) + break + except (OSError, IOError): + pass + else: + self.report_error(u'm3u8 download detected but ffmpeg or avconv could not be found') + cmd = [program] + args + + retval = subprocess.call(cmd) if retval == 0: fsize = os.path.getsize(encodeFilename(tmpfilename)) self.to_screen(u'\r[%s] %s bytes' % (args[0], fsize))