projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into prefer-webm
[youtube-dl]
/
youtube-dl
diff --git
a/youtube-dl
b/youtube-dl
index 617ac1339b67d23bd8a9f2571a30a4e41945c274..af6522bacf176c3428036082223444c86864c45d 100755
(executable)
--- a/
youtube-dl
+++ b/
youtube-dl
@@
-864,7
+864,7
@@
class YoutubeIE(InfoExtractor):
_AGE_URL = 'http://www.youtube.com/verify_age?next_url=/&gl=US&hl=en'
_NETRC_MACHINE = 'youtube'
# Listed in order of quality
_AGE_URL = 'http://www.youtube.com/verify_age?next_url=/&gl=US&hl=en'
_NETRC_MACHINE = 'youtube'
# Listed in order of quality
- _available_formats = ['38', '37', '
22', '45', '35', '34', '43
', '18', '6', '5', '17', '13']
+ _available_formats = ['38', '37', '
45', '22', '43', '35', '34
', '18', '6', '5', '17', '13']
_video_extensions = {
'13': '3gp',
'17': 'mp4',
_video_extensions = {
'13': '3gp',
'17': 'mp4',
@@
-2723,7
+2723,7
@@
if __name__ == '__main__':
# Parse command line
parser = optparse.OptionParser(
usage='Usage: %prog [options] url...',
# Parse command line
parser = optparse.OptionParser(
usage='Usage: %prog [options] url...',
- version='2011.02.25',
+ version='2011.02.25
b
',
conflict_handler='resolve',
)
conflict_handler='resolve',
)