diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2013-01-10 19:15:04 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2013-01-10 19:15:04 +0100 |
| commit | 510e6f6dc19681c89a866562bb372032313bf272 (patch) | |
| tree | 0d06abad517de7960cad3e2ffd72a970cc086e93 | |
| parent | 712e86b999ef8ba56afb9c5b8a12699b5a0bbc5d (diff) | |
| download | youtube-dl-510e6f6dc19681c89a866562bb372032313bf272.tar.gz youtube-dl-510e6f6dc19681c89a866562bb372032313bf272.tar.xz youtube-dl-510e6f6dc19681c89a866562bb372032313bf272.zip | |
Support --audio-format=opus
| -rw-r--r-- | youtube_dl/PostProcessor.py | 4 | ||||
| -rw-r--r-- | youtube_dl/__init__.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/youtube_dl/PostProcessor.py b/youtube_dl/PostProcessor.py index d7c7346d7..79a0d7928 100644 --- a/youtube_dl/PostProcessor.py +++ b/youtube_dl/PostProcessor.py @@ -132,7 +132,7 @@ class FFmpegExtractAudioPP(PostProcessor): acodec = 'copy' extension = self._preferredcodec more_opts = [self._exes['avconv'] and '-bsf:a' or '-absf', 'aac_adtstoasc'] - elif filecodec in ['aac', 'mp3', 'vorbis']: + elif filecodec in ['aac', 'mp3', 'vorbis', 'opus']: # Lossless if possible acodec = 'copy' extension = filecodec @@ -152,7 +152,7 @@ class FFmpegExtractAudioPP(PostProcessor): 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] + acodec = {'mp3': 'libmp3lame', 'aac': 'aac', 'm4a': 'aac', 'opus': 'opus', 'vorbis': 'libvorbis', 'wav': None}[self._preferredcodec] extension = self._preferredcodec more_opts = [] if self._preferredquality is not None: diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 1d914709f..d7ab0f086 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -248,7 +248,7 @@ def parseOpts(): postproc.add_option('-x', '--extract-audio', action='store_true', dest='extractaudio', default=False, help='convert video files to audio-only files (requires ffmpeg or avconv and ffprobe or avprobe)') postproc.add_option('--audio-format', metavar='FORMAT', dest='audioformat', default='best', - help='"best", "aac", "vorbis", "mp3", "m4a", or "wav"; best by default') + help='"best", "aac", "vorbis", "mp3", "m4a", "opus", or "wav"; best by default') postproc.add_option('--audio-quality', metavar='QUALITY', dest='audioquality', default='5', help='ffmpeg/avconv audio quality specification, insert a value between 0 (better) and 9 (worse) for VBR or a specific bitrate like 128K (default 5)') postproc.add_option('-k', '--keep-video', action='store_true', dest='keepvideo', default=False, @@ -370,7 +370,7 @@ def _real_main(): except (TypeError, ValueError) as err: parser.error(u'invalid playlist end number specified') if opts.extractaudio: - if opts.audioformat not in ['best', 'aac', 'mp3', 'vorbis', 'm4a', 'wav']: + if opts.audioformat not in ['best', 'aac', 'mp3', 'm4a', 'opus', 'vorbis', 'wav']: parser.error(u'invalid audio format specified') if opts.audioquality: opts.audioquality = opts.audioquality.strip('k').strip('K') |