From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 13 Oct 2013 13:26:10 +0000 (+0200)
Subject: Merge remote-tracking branch 'jaimeMF/opus-fix'
X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=06723d47c4f934542a626569045e489a09796975;hp=-c;p=youtube-dl.git

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

06723d47c4f934542a626569045e489a09796975
diff --combined youtube_dl/PostProcessor.py
index 0479591f0,07b6895c0..039e01498
--- a/youtube_dl/PostProcessor.py
+++ b/youtube_dl/PostProcessor.py
@@@ -83,8 -83,6 +83,8 @@@ class FFmpegPostProcessor(PostProcessor
                 + opts +
                 [encodeFilename(self._ffmpeg_filename_argument(out_path))])
  
 +        if self._downloader.params.get('verbose', False):
 +            self._downloader.to_screen(u'[debug] ffmpeg command line: %s' % shell_quote(cmd))
          p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
          stdout,stderr = p.communicate()
          if p.returncode != 0:
@@@ -180,7 -178,8 +180,8 @@@ class FFmpegExtractAudioPP(FFmpegPostPr
              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']