commit b19fc36c813c7a78f15b2df23118962789225852
parent d2d8248f68c029472bb81eacf4aa15987729977f
Author: Sergey M <dstftw@gmail.com>
Date: Sat, 25 Apr 2015 23:19:59 +0500
Merge pull request #5521 from mrkrossxdx/mpv
Added support for mpv if mplayer is not available (new version)
Diffstat:
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/youtube_dl/downloader/mplayer.py b/youtube_dl/downloader/mplayer.py
@@ -16,12 +16,19 @@ class MplayerFD(FileDownloader):
self.report_destination(filename)
tmpfilename = self.temp_name(filename)
- args = [
- 'mplayer', '-really-quiet', '-vo', 'null', '-vc', 'dummy',
- '-dumpstream', '-dumpfile', tmpfilename, url]
+ args = []
# Check for mplayer first
- if not check_executable('mplayer', ['-h']):
- self.report_error('MMS or RTSP download detected but "%s" could not be run' % args[0])
+ 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]
+ else:
+ self.report_error('MMS or RTSP download detected but neither "mplayer" nor "mpv" could be run')
return False
# Download using mplayer.