diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2014-11-23 22:10:26 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2014-11-23 22:10:26 +0100 |
| commit | 27f8b0994e9924724c974f46435552d401f5fc08 (patch) | |
| tree | fa3ab829cc1e81a43f955ca9442ce59dfee6440b /youtube_dl/extractor/flickr.py | |
| parent | e311b6389a7582eef6f3f8ca4b41edd4efd6cd55 (diff) | |
| parent | fab6d4c048f56aa1c36897396a7fb590ae415d66 (diff) | |
Merge remote-tracking branch 'jtwaleson/master'
Diffstat (limited to 'youtube_dl/extractor/flickr.py')
| -rw-r--r-- | youtube_dl/extractor/flickr.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/extractor/flickr.py b/youtube_dl/extractor/flickr.py index 5b0bc9d21..0c858b654 100644 --- a/youtube_dl/extractor/flickr.py +++ b/youtube_dl/extractor/flickr.py @@ -37,7 +37,7 @@ class FlickrIE(InfoExtractor): first_xml = self._download_webpage(first_url, video_id, 'Downloading first data webpage') node_id = self._html_search_regex(r'<Item id="id">(\d+-\d+)</Item>', - first_xml, 'node_id') + first_xml, 'node_id') second_url = 'https://secure.flickr.com/video_playlist.gne?node_id=' + node_id + '&tech=flash&mode=playlist&bitrate=700&secret=' + secret + '&rd=video.yahoo.com&noad=1' second_xml = self._download_webpage(second_url, video_id, 'Downloading second data webpage') |