From: Sergey M. <dstftw@gmail.com>
Date: Wed, 26 Feb 2014 10:53:54 +0000 (-0800)
Subject: Merge pull request #2464 from rzhxeo/xhamster
X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=2648c436f33e4097427e50039f88fdd1fb751216;hp=33f1f2c455a26e74347b3c0bfc76134bb5cca3df;p=youtube-dl.git

Merge pull request #2464 from rzhxeo/xhamster

[XHamsterIE] Make hd video search more robust
---

diff --git a/youtube_dl/extractor/xhamster.py b/youtube_dl/extractor/xhamster.py
index a75e1380d..5374495f9 100644
--- a/youtube_dl/extractor/xhamster.py
+++ b/youtube_dl/extractor/xhamster.py
@@ -103,6 +103,7 @@ class XHamsterIE(InfoExtractor):
         }]
 
         if not hd:
+            mrss_url = self._search_regex(r'<link rel="canonical" href="([^"]+)', webpage, 'mrss_url')
             webpage = self._download_webpage(mrss_url + '?hd', video_id, note='Downloading HD webpage')
             if is_hd(webpage):
                 video_url = extract_video_url(webpage)