Merge branch 'master' into prefer-webm

[youtube-dl] / youtube-dl

diff --git a/youtube-dl b/youtube-dl
index 0f9724637bc65378c9a49ebdd177fa13740399e1..b7014074702f51fb11b350b5c10e83e57cfe6165 100755 (executable)
--- a/youtube-dl
+++ b/youtube-dl
@@ -863,7 +863,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
-       _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',
@@ -2135,6 +2135,7 @@ class YoutubePlaylistIE(InfoExtractor):
                if playlist_prefix == 'a':
                        playlist_access = 'artist'
                else:
+                       playlist_prefix = 'p'
                        playlist_access = 'view_play_list'
                playlist_id = mobj.group(2)
                video_ids = []