X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2FFileDownloader.py;h=bf0f5bb9ef9834247c465204af006cfdfffc8efd;hb=3054ff0cbebc7969d918f0deee76cd37ea6f5b40;hp=2c35a05d8221c7834ebf98a3a40561ad9853f9c1;hpb=f2cd958c0a09bca580a955c60c19e177f6ff45b8;p=youtube-dl diff --git a/youtube_dl/FileDownloader.py b/youtube_dl/FileDownloader.py index 2c35a05d8..bf0f5bb9e 100644 --- a/youtube_dl/FileDownloader.py +++ b/youtube_dl/FileDownloader.py @@ -814,12 +814,10 @@ class FileDownloader(object): self.report_destination(filename) tmpfilename = self.temp_name(filename) -# args = ['mmsclient', url] # doesn't work anymore -# args = ['wpro', url, '-O', tmpfilename] # dont work args = ['mplayer', '-really-quiet', '-vo', 'null', '-vc', 'dummy', '-dumpstream', '-dumpfile', tmpfilename, url] # Check for mplayer first try: - subprocess.call(args[0], stdout=(open(os.path.devnull, 'w')), stderr=subprocess.STDOUT) + subprocess.call(['mplayer', '-h'], stdout=(open(os.path.devnull, 'w')), stderr=subprocess.STDOUT) except (OSError, IOError): self.report_error(u'MMS or RTSP download detected but "%s" could not be run' % args[0] ) return False @@ -839,7 +837,7 @@ class FileDownloader(object): return True else: self.to_stderr(u"\n") - self.report_error(u'%s exited with code %d' % (args[0], retval)) + self.report_error(u'mplayer exited with code %d' % retval) return False