diff options
| author | Sergey M․ <dstftw@gmail.com> | 2015-04-26 00:23:16 +0600 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2015-04-26 00:23:16 +0600 |
| commit | b874495b1fa339126c306df54aa316043ac0047b (patch) | |
| tree | 1763370810cb6e72b755fd85da26a8b7af2dc9c6 | |
| parent | b860f5dfd45f58b2c0a92cecd28c7eb05a7a2ff4 (diff) | |
| download | youtube-dl-b874495b1fa339126c306df54aa316043ac0047b.tar.xz | |
[mplayer] Simplify
| -rw-r--r-- | youtube_dl/downloader/mplayer.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/youtube_dl/downloader/mplayer.py b/youtube_dl/downloader/mplayer.py index b1ea8daa6..0cad5a148 100644 --- a/youtube_dl/downloader/mplayer.py +++ b/youtube_dl/downloader/mplayer.py @@ -16,14 +16,10 @@ class MplayerFD(FileDownloader): self.report_destination(filename) tmpfilename = self.temp_name(filename) - args = [] - # Check for mplayer first if check_executable('mplayer', ['-h']): args = [ 'mplayer', '-really-quiet', '-vo', 'null', '-vc', 'dummy', '-dumpstream', '-dumpfile', tmpfilename, url] - - # Check for mpv elif check_executable('mpv', ['-h']): args = [ 'mpv', '-really-quiet', '--vo=null', '--stream-dump=' + tmpfilename, url] @@ -31,7 +27,6 @@ class MplayerFD(FileDownloader): self.report_error('MMS or RTSP download detected but neither "mplayer" nor "mpv" could be run. Please install any.') return False - # Download using mplayer. retval = subprocess.call(args) if retval == 0: fsize = os.path.getsize(encodeFilename(tmpfilename)) @@ -46,5 +41,5 @@ class MplayerFD(FileDownloader): return True else: self.to_stderr('\n') - self.report_error('mplayer exited with code %d' % retval) + self.report_error('%s exited with code %d' % (args[0], retval)) return False |