projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[vlive] Add test for #11203
[youtube-dl]
/
youtube_dl
/
YoutubeDL.py
diff --git
a/youtube_dl/YoutubeDL.py
b/youtube_dl/YoutubeDL.py
index 29d8517a30a5a077e0f6a2e8a51200b66628e91f..53f20ac2cb1bd16398e160db329004b49d6bf424 100755
(executable)
--- a/
youtube_dl/YoutubeDL.py
+++ b/
youtube_dl/YoutubeDL.py
@@
-1,5
+1,5
@@
#!/usr/bin/env python
#!/usr/bin/env python
-#
-*- coding: utf-8 -*-
+#
coding: utf-8
from __future__ import absolute_import, unicode_literals
from __future__ import absolute_import, unicode_literals
@@
-131,9
+131,9
@@
class YoutubeDL(object):
username: Username for authentication purposes.
password: Password for authentication purposes.
videopassword: Password for accessing a video.
username: Username for authentication purposes.
password: Password for authentication purposes.
videopassword: Password for accessing a video.
- ap_mso: Adobe Pass
Multiple-system operator I
dentifier.
- ap_username:
TV Provider username for authentication purposes
.
- ap_password:
TV Provider password for authentication purposes
.
+ ap_mso: Adobe Pass
multiple-system operator i
dentifier.
+ ap_username:
Multiple-system operator account username
.
+ ap_password:
Multiple-system operator account password
.
usenetrc: Use netrc for authentication instead.
verbose: Print additional info to stdout.
quiet: Do not print messages to stdout.
usenetrc: Use netrc for authentication instead.
verbose: Print additional info to stdout.
quiet: Do not print messages to stdout.
@@
-1658,7
+1658,7
@@
class YoutubeDL(object):
video_ext, audio_ext = audio.get('ext'), video.get('ext')
if video_ext and audio_ext:
COMPATIBLE_EXTS = (
video_ext, audio_ext = audio.get('ext'), video.get('ext')
if video_ext and audio_ext:
COMPATIBLE_EXTS = (
- ('mp3', 'mp4', 'm4a', 'm4p', 'm4b', 'm4r', 'm4v'),
+ ('mp3', 'mp4', 'm4a', 'm4p', 'm4b', 'm4r', 'm4v'
, 'ismv', 'isma'
),
('webm')
)
for exts in COMPATIBLE_EXTS:
('webm')
)
for exts in COMPATIBLE_EXTS: