projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[downloader/common] Do not use classic int division
[youtube-dl]
/
youtube_dl
/
downloader
/
hls.py
diff --git
a/youtube_dl/downloader/hls.py
b/youtube_dl/downloader/hls.py
index 68eafa403df4ad157feb13174584786205b41bea..ad26cfa4085bbb028c7252aa9db2a8de3f7bd1e4 100644
(file)
--- a/
youtube_dl/downloader/hls.py
+++ b/
youtube_dl/downloader/hls.py
@@
-4,6
+4,7
@@
import os
import re
import subprocess
import re
import subprocess
+from ..postprocessor.ffmpeg import FFmpegPostProcessor
from .common import FileDownloader
from ..utils import (
compat_urlparse,
from .common import FileDownloader
from ..utils import (
compat_urlparse,
@@
-28,14
+29,17
@@
class HlsFD(FileDownloader):
if check_executable(program, ['-version']):
break
else:
if check_executable(program, ['-version']):
break
else:
- self.report_error(
u
'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
cmd = [program] + args
return False
cmd = [program] + args
+ ffpp = FFmpegPostProcessor(downloader=self)
+ ffpp.check_version()
+
retval = subprocess.call(cmd)
if retval == 0:
fsize = os.path.getsize(encodeFilename(tmpfilename))
retval = subprocess.call(cmd)
if retval == 0:
fsize = os.path.getsize(encodeFilename(tmpfilename))
- self.to_screen(
u
'\r[%s] %s bytes' % (cmd[0], fsize))
+ self.to_screen('\r[%s] %s bytes' % (cmd[0], fsize))
self.try_rename(tmpfilename, filename)
self._hook_progress({
'downloaded_bytes': fsize,
self.try_rename(tmpfilename, filename)
self._hook_progress({
'downloaded_bytes': fsize,
@@
-45,8
+49,8
@@
class HlsFD(FileDownloader):
})
return True
else:
})
return True
else:
- self.to_stderr(
u"\n"
)
- self.report_error(
u
'%s exited with code %d' % (program, retval))
+ self.to_stderr(
'\n'
)
+ self.report_error('%s exited with code %d' % (program, retval))
return False
return False
@@
-101,4
+105,3
@@
class NativeHlsFD(FileDownloader):
})
self.try_rename(tmpfilename, filename)
return True
})
self.try_rename(tmpfilename, filename)
return True
-