youtube-dl

commit e296100005a47ec9f8c2bf0e9827430fc0e96fae
parent e704f4d3785b318d7f4d3a034424b54ce50beb88
Author: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date:   Sat, 22 Jun 2013 03:35:32 -0700

Merge pull request #888 from rg3/youtube_playlists_fix_886

YoutubePlaylistIE: try to extract the url of the entries from the media$group dictionary (closes #886)
Diffstat:
M
youtube_dl/InfoExtractors.py
 | 
7
++++---

1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py
@@ -1609,9 +1609,10 @@ class YoutubePlaylistIE(InfoExtractor):
                 # Number of videos is a multiple of self._MAX_RESULTS
                 break
 
-            videos += [ (entry['yt$position']['$t'], entry['content']['src'])
-                        for entry in response['feed']['entry']
-                        if 'content' in entry ]
+            for entry in response['feed']['entry']:
+                index = entry['yt$position']['$t']
+                if 'media$group' in entry and 'media$player' in entry['media$group']:
+                    videos.append((index, entry['media$group']['media$player']['url']))
 
             if len(response['feed']['entry']) < self._MAX_RESULTS:
                 break