diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2012-09-27 20:18:29 +0200 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2012-09-27 20:18:29 +0200 |
| commit | 234e230c8781ed46013a6a26d56c4b1dcbe57e69 (patch) | |
| tree | 711b462a8a59d31fbc830d523a029c021742f8ea /youtube_dl/PostProcessor.py | |
| parent | 34ae0f9d2019c043f86cb31d37ba30fea9c2faf2 (diff) | |
| parent | 3a68d7b467d59e6df4d8473989dcd9edb460dd75 (diff) | |
Merge remote-tracking branch 'FiloSottille/vbr'
Conflicts:
youtube-dl
youtube-dl.exe
Diffstat (limited to 'youtube_dl/PostProcessor.py')
| -rw-r--r-- | youtube_dl/PostProcessor.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/youtube_dl/PostProcessor.py b/youtube_dl/PostProcessor.py index 527dc3a3d..375da1aa3 100644 --- a/youtube_dl/PostProcessor.py +++ b/youtube_dl/PostProcessor.py @@ -142,14 +142,20 @@ class FFmpegExtractAudioPP(PostProcessor): extension = 'mp3' more_opts = [] if self._preferredquality is not None: - more_opts += [self._exes['avconv'] and '-b:a' or '-ab', self._preferredquality] + 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] else: # We convert the audio (lossy) acodec = {'mp3': 'libmp3lame', 'aac': 'aac', 'm4a': 'aac', 'vorbis': 'libvorbis', 'wav': None}[self._preferredcodec] extension = self._preferredcodec more_opts = [] if self._preferredquality is not None: - more_opts += [self._exes['avconv'] and '-b:a' or '-ab', self._preferredquality] + 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] if self._preferredcodec == 'aac': more_opts += ['-f', 'adts'] if self._preferredcodec == 'm4a': |