aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-06-10 18:14:44 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2013-06-10 18:14:45 +0200
commit8cd252f115c67a67a2c230bc1b28401a88106d70 (patch)
treeb7f098a931d37b88438bcfade05fc43431091985
parent53f72b11e58a22674476b8695eca13516d11f3eb (diff)
Use long rtmpdump options
Note that we accidentally called rtmpdump with -v (--live) instead of -V (--verbose) because we missed this.
-rw-r--r--youtube_dl/FileDownloader.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py
index a8517a390..72f03c217 100644
--- a/youtube_dl/FileDownloader.py
+++ b/youtube_dl/FileDownloader.py
@@ -763,21 +763,21 @@ class FileDownloader(object):
except (OSError, IOError):
self.report_error(u'RTMP download detected but "rtmpdump" could not be run')
return False
+ verbosity_option = '--verbose' if self.params.get('verbose', False) else '--quiet'
# Download using rtmpdump. rtmpdump returns exit code 2 when
# the connection was interrumpted and resuming appears to be
# possible. This is part of rtmpdump's normal usage, AFAIK.
- basic_args = ['rtmpdump', '-q', '-r', url, '-o', tmpfilename]
- if self.params.get('verbose', False): basic_args[1] = '-v'
+ basic_args = ['rtmpdump', verbosity_option, '-r', url, '-o', tmpfilename]
if player_url is not None:
- basic_args += ['-W', player_url]
+ basic_args += ['--swfVfy', player_url]
if page_url is not None:
basic_args += ['--pageUrl', page_url]
if play_path is not None:
- basic_args += ['-y', play_path]
+ basic_args += ['--playpath', play_path]
if tc_url is not None:
basic_args += ['--tcUrl', url]
- args = basic_args + [[], ['-e', '-k', '1']][self.params.get('continuedl', False)]
+ args = basic_args + [[], ['--resume', '--skip', '1']][self.params.get('continuedl', False)]
if self.params.get('verbose', False):
try:
import pipes