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 f2e2aa1fadf5e8c8c1962ef11851820802550ce0..0501cc7f6075cc4b99264cae2f84b57691fb1d3a 100644 (file)
--- a/youtube_dl/PostProcessor.py
+++ b/youtube_dl/PostProcessor.py
@@ -73,7 +73,7 @@ class FFmpegExtractAudioPP(PostProcessor):
        def detect_executables():
                def executable(exe):
                        try:
-                               subprocess.check_output([exe, '-version'])
+                               subprocess.Popen([exe, '-version'], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
                        except OSError:
                                return False
                        return exe
@@ -146,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]
@@ -156,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':