Merge remote-tracking branch 'jaimeMF/opus-fix'

diff --git a/youtube_dl/PostProcessor.py b/youtube_dl/PostProcessor.py
index 0479591f00c49fb1a4e2205c7cf4dc805ee04122..039e014982e2396ad3175a4c3fcd3dc15030952e 100644 (file)
--- a/youtube_dl/PostProcessor.py
+++ b/youtube_dl/PostProcessor.py
@@ -180,7 +180,8 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor):
             extension = self._preferredcodec
             more_opts = []
             if self._preferredquality is not None:
-                if int(self._preferredquality) < 10:
+                # The opus codec doesn't support the -aq option
+                if int(self._preferredquality) < 10 and extension != 'opus':
                     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 + 'k']