depau/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-25 19:52:11 +00:00
Code Issues Releases Wiki Activity

[downloader/mplayer] Use check_executable

Browse source
This commit is contained in:
Jaime Marquínez Ferrándiz 2015-01-03 00:33:36 +01:00
parent a221f22969
commit d26b1317ed
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
youtube_dl/downloader/mplayer.py
View file

@ -6,6 +6,7 @@ import subprocess
from .common import FileDownloader from .common import FileDownloader
from ..compat import compat_subprocess_get_DEVNULL from ..compat import compat_subprocess_get_DEVNULL
from ..utils import ( from ..utils import (
check_executable,
encodeFilename, encodeFilename,
) )
@ -20,11 +21,7 @@ class MplayerFD(FileDownloader):
'mplayer', '-really-quiet', '-vo', 'null', '-vc', 'dummy', 'mplayer', '-really-quiet', '-vo', 'null', '-vc', 'dummy',
'-dumpstream', '-dumpfile', tmpfilename, url] '-dumpstream', '-dumpfile', tmpfilename, url]
# Check for mplayer first # Check for mplayer first
try: if not check_executable('mplayer', ['-h']):
subprocess.call(
['mplayer', '-h'],
stdout=compat_subprocess_get_DEVNULL(), stderr=subprocess.STDOUT)
except (OSError, IOError):
self.report_error('MMS or RTSP download detected but "%s" could not be run' % args[0]) self.report_error('MMS or RTSP download detected but "%s" could not be run' % args[0])
return False return False