projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'vgtv' of https://github.com/mrkolby/youtube-dl into mrkolby-vgtv
[youtube-dl]
/
youtube_dl
/
downloader
/
hls.py
diff --git
a/youtube_dl/downloader/hls.py
b/youtube_dl/downloader/hls.py
index 9d407fe6eb81683b19c5671ef7b92050e0a690c3..32852f333a0a6329f48ef2d690555d218d4228c5 100644
(file)
--- 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 (
from .common import FileDownloader
from ..utils import (
+ check_executable,
encodeFilename,
)
encodeFilename,
)
@@
-19,13
+20,11
@@
class HlsFD(FileDownloader):
encodeFilename(tmpfilename, for_subprocess=True)]
for program in ['avconv', 'ffmpeg']:
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
break
- except (OSError, IOError):
- pass
else:
else:
- self.report_error(u'm3u8 download detected but ffmpeg or avconv could not be found')
+ self.report_error(u'm3u8 download detected but ffmpeg or avconv could not be found. Please install one.')
+ return False
cmd = [program] + args
retval = subprocess.call(cmd)
cmd = [program] + args
retval = subprocess.call(cmd)
@@
-42,5
+41,5
@@
class HlsFD(FileDownloader):
return True
else:
self.to_stderr(u"\n")
return True
else:
self.to_stderr(u"\n")
- self.report_error(u'
ffmpeg exited with code %d' % retval
)
+ self.report_error(u'
%s exited with code %d' % (program, retval)
)
return False
return False