Merge branch 'master' into rtmpdump

Conflicts:
	youtube_dl/FileDownloader.py

Merge

diff --cc youtube_dl/FileDownloader.py
index 664b78662af3676571b35fc5c8c84c82b52be4a9,e5a542ed55d2d86f46b95c51da80bb66c17fa947..84a539b825051e268cacd828156b70eeee4a0fab
--- 1/youtube_dl/FileDownloader.py
--- 2/youtube_dl/FileDownloader.py
+++ b/youtube_dl/FileDownloader.py
@@@ -267,62 -269,7 +269,62 @@@ 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):
 +        def run_rtmpdump(args):
 +            start = time.time()
 +            resume_percent = None
 +            resume_downloaded_data_len = None
 +            proc = subprocess.Popen(args, stderr=subprocess.PIPE)
 +            cursor_in_new_line = True
 +            proc_stderr_closed = False
 +            while not proc_stderr_closed:
 +                # read line from stderr
 +                line = u''
 +                while True:
 +                    char = proc.stderr.read(1)
 +                    if not char:
 +                        proc_stderr_closed = True
 +                        break
 +                    if char in [b'\r', b'\n']:
 +                        break
 +                    line += char.decode('ascii', 'replace')
 +                if not line:
 +                    # proc_stderr_closed is True
 +                    continue
 +                mobj = re.search(r'([0-9]+\.[0-9]{3}) kB / [0-9]+\.[0-9]{2} sec \(([0-9]{1,2}\.[0-9])%\)', line)
 +                if mobj:
 +                    downloaded_data_len = int(float(mobj.group(1))*1024)
 +                    percent = float(mobj.group(2))
 +                    if not resume_percent:
 +                        resume_percent = percent
 +                        resume_downloaded_data_len = downloaded_data_len
 +                    eta = self.calc_eta(start, time.time(), 100-resume_percent, percent-resume_percent)
 +                    speed = self.calc_speed(start, time.time(), downloaded_data_len-resume_downloaded_data_len)
 +                    data_len = None
 +                    if percent > 0:
 +                        data_len = int(downloaded_data_len * 100 / percent)
 +                    data_len_str = u'~'+self.format_bytes(data_len)
 +                    self.report_progress(percent, data_len_str, speed, eta)
 +                    cursor_in_new_line = False
 +                    self._hook_progress({
 +                        'downloaded_bytes': downloaded_data_len,
 +                        'total_bytes': data_len,
 +                        'tmpfilename': tmpfilename,
 +                        'filename': filename,
 +                        'status': 'downloading',
 +                        'eta': eta,
 +                        'speed': speed,
 +                    })
 +                elif self.params.get('verbose', False):
 +                    if not cursor_in_new_line:
 +                        self.to_screen(u'')
 +                    cursor_in_new_line = True
 +                    self.to_screen(u'[rtmpdump] '+line)
 +            proc.wait()
 +            if not cursor_in_new_line:
 +                self.to_screen(u'')
 +            return proc.returncode
 +
          self.report_destination(filename)
          tmpfilename = self.temp_name(filename)
          test = self.params.get('test', False)