diff options
| author | remitamine <remitamine@gmail.com> | 2015-12-03 20:33:22 +0100 | 
|---|---|---|
| committer | remitamine <remitamine@gmail.com> | 2015-12-03 20:33:22 +0100 | 
| commit | 78653a33aa00ba5205940c2baac5d9f019795b88 (patch) | |
| tree | 246fd038effd402bc66de4c8afb36e6c318efcaa /youtube_dl/downloader/rtmp.py | |
| parent | 77302fe5c989b9cafcb675c0a03642b80fa557ff (diff) | |
| parent | 24dc1ed715239f85eb3d5f71a707da1dd2bc7773 (diff) | |
Merge remote-tracking branch 'upstream/master' into bliptv
Diffstat (limited to 'youtube_dl/downloader/rtmp.py')
| -rw-r--r-- | youtube_dl/downloader/rtmp.py | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/youtube_dl/downloader/rtmp.py b/youtube_dl/downloader/rtmp.py index f1d219ba9..14d56db47 100644 --- a/youtube_dl/downloader/rtmp.py +++ b/youtube_dl/downloader/rtmp.py @@ -117,7 +117,7 @@ class RtmpFD(FileDownloader):              return False          # Download using rtmpdump. rtmpdump returns exit code 2 when -        # the connection was interrumpted and resuming appears to be +        # the connection was interrupted and resuming appears to be          # possible. This is part of rtmpdump's normal usage, AFAIK.          basic_args = [              'rtmpdump', '--verbose', '-r', url, | 
