Merge remote-tracking branch 'Asido/master'

[youtube-dl] / youtube_dl / PostProcessor.py

diff --git a/youtube_dl/PostProcessor.py b/youtube_dl/PostProcessor.py
index 375da1aa3f08cf0fb9d9886ee1b6d4308d18c763..0501cc7f6075cc4b99264cae2f84b57691fb1d3a 100644 (file)
--- a/youtube_dl/PostProcessor.py
+++ b/youtube_dl/PostProcessor.py
@@ -71,13 +71,14 @@ class FFmpegExtractAudioPP(PostProcessor):
 
        @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.Popen([exe, '-version'], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
+                       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
@@ -145,7 +146,7 @@ class FFmpegExtractAudioPP(PostProcessor):
                                        if int(self._preferredquality) < 10:
                                                more_opts += [self._exes['avconv'] and '-q:a' or '-aq', self._preferredquality]
                                        else:
-                                               more_opts += [self._exes['avconv'] and '-b:a' or '-ab', self._preferredquality]
+                                               more_opts += [self._exes['avconv'] and '-b:a' or '-ab', self._preferredquality + 'k']
                else:
                        # We convert the audio (lossy)
                        acodec = {'mp3': 'libmp3lame', 'aac': 'aac', 'm4a': 'aac', 'vorbis': 'libvorbis', 'wav': None}[self._preferredcodec]
@@ -155,7 +156,7 @@ class FFmpegExtractAudioPP(PostProcessor):
                                if int(self._preferredquality) < 10:
                                        more_opts += [self._exes['avconv'] and '-q:a' or '-aq', self._preferredquality]
                                else:
-                                       more_opts += [self._exes['avconv'] and '-b:a' or '-ab', self._preferredquality]
+                                       more_opts += [self._exes['avconv'] and '-b:a' or '-ab', self._preferredquality + 'k']
                        if self._preferredcodec == 'aac':
                                more_opts += ['-f', 'adts']
                        if self._preferredcodec == 'm4a':