Permalink
Browse files

Correct detect_executables on Windows (Closes #447, #457)

  • Loading branch information...
phihag committed Oct 8, 2012
1 parent b7b4796 commit 65f934dc930f7996e137d61dd80ef092f9075532
Showing with 8 additions and 7 deletions.
  1. +8 −7 youtube_dl/PostProcessor.py
@@ -71,13 +71,14 @@ def __init__(self, downloader=None, preferredcodec=None, preferredquality=None,
@staticmethod
def detect_executables():
- available = {'avprobe' : False, 'avconv' : False, 'ffmpeg' : False, 'ffprobe' : False}
- for path in os.environ["PATH"].split(os.pathsep):
- for program in available.keys():
- exe_file = os.path.join(path, program)
- if os.path.isfile(exe_file) and os.access(exe_file, os.X_OK):
- available[program] = exe_file
- return available
+ def executable(exe):
+ try:
+ subprocess.check_output([exe, '-version'])
+ except OSError:
+ return False
+ return exe
+ programs = ['avprobe', 'avconv', 'ffmpeg', 'ffprobe']
+ return dict((program, executable(program)) for program in programs)
def get_audio_codec(self, path):
if not self._exes['ffprobe'] and not self._exes['avprobe']: return None

0 comments on commit 65f934d

Please sign in to comment.