summaryrefslogtreecommitdiffhomepage
path: root/youtube_dl/FileDownloader.py
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <[email protected]>2013-11-10 12:38:40 +0100
committerJaime Marquínez Ferrándiz <[email protected]>2013-11-10 12:38:40 +0100
commit1008bebaded30e0c1dcce33300fa4096331aec4b (patch)
treebf9a5b8e57fe6ec103414e76604afcb6894db0db /youtube_dl/FileDownloader.py
parentae84f879d77bab5ea6fd9a4d74b82b46a11c9072 (diff)
parent0a43ddf3209e13f5e87b07c440e03a45deea3e57 (diff)
downloadyoutube-dl-1008bebaded30e0c1dcce33300fa4096331aec4b.tar.gz
youtube-dl-1008bebaded30e0c1dcce33300fa4096331aec4b.zip
Merge remote-tracking branch 'rzhxeo/rtmpdump_live'
Diffstat (limited to 'youtube_dl/FileDownloader.py')
-rw-r--r--youtube_dl/FileDownloader.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py
index 35fa3ca61..04784f602 100644
--- a/youtube_dl/FileDownloader.py
+++ b/youtube_dl/FileDownloader.py
@@ -280,7 +280,7 @@ class FileDownloader(object):
self.to_screen(u'\r%s[download] 100%% of %s in %s' %
(clear_line, data_len_str, self.format_seconds(tot_time)))
- def _download_with_rtmpdump(self, filename, url, player_url, page_url, play_path, tc_url):
+ def _download_with_rtmpdump(self, filename, url, player_url, page_url, play_path, tc_url, live):
self.report_destination(filename)
tmpfilename = self.temp_name(filename)
test = self.params.get('test', False)
@@ -307,6 +307,8 @@ class FileDownloader(object):
basic_args += ['--tcUrl', url]
if test:
basic_args += ['--stop', '1']
+ if live:
+ basic_args += ['--live']
args = basic_args + [[], ['--resume', '--skip', '1']][self.params.get('continuedl', False)]
if self.params.get('verbose', False):
try:
@@ -425,7 +427,8 @@ class FileDownloader(object):
info_dict.get('player_url', None),
info_dict.get('page_url', None),
info_dict.get('play_path', None),
- info_dict.get('tc_url', None))
+ info_dict.get('tc_url', None),
+ info_dict.get('live', False))
# Attempt to download using mplayer
if url.startswith('mms') or url.startswith('rtsp'):