Browse Source

[downloader/hls] Respect the 'prefer_ffmpeg' option

master
Jaime Marquínez Ferrándiz 10 years ago
parent
commit
63948fc62c
1 changed files with 4 additions and 8 deletions
  1. 12
      youtube_dl/downloader/hls.py

12
youtube_dl/downloader/hls.py

@ -11,7 +11,6 @@ from ..compat import (
compat_urllib_request, compat_urllib_request,
) )
from ..utils import ( from ..utils import (
check_executable,
encodeFilename, encodeFilename,
) )
@ -27,16 +26,13 @@ class HlsFD(FileDownloader):
'-bsf:a', 'aac_adtstoasc', '-bsf:a', 'aac_adtstoasc',
encodeFilename(tmpfilename, for_subprocess=True)] encodeFilename(tmpfilename, for_subprocess=True)]
for program in ['avconv', 'ffmpeg']:
if check_executable(program, ['-version']):
break
else:
ffpp = FFmpegPostProcessor(downloader=self)
program = ffpp._executable
if program is None:
self.report_error('m3u8 download detected but ffmpeg or avconv could not be found. Please install one.') self.report_error('m3u8 download detected but ffmpeg or avconv could not be found. Please install one.')
return False return False
cmd = [program] + args
ffpp = FFmpegPostProcessor(downloader=self)
ffpp.check_version() ffpp.check_version()
cmd = [program] + args
retval = subprocess.call(cmd) retval = subprocess.call(cmd)
if retval == 0: if retval == 0:

Loading…
Cancel
Save