Merge branch 'master' of https://github.com/rg3/youtube-dl

AUTHORS

@@ -230,3 +230,4 @@ Ashutosh Chaudhary
 John Dong
 Tatsuyuki Ishi
 Daniel Weber
+Kay Bouché

youtube_dl/extractor/xhamster.py

@@ -222,7 +222,7 @@ class XHamsterEmbedIE(InfoExtractor):
         webpage = self._download_webpage(url, video_id)
 
         video_url = self._search_regex(
-            r'href="(https?://xhamster\.com/movies/%s/[^"]*\.html[^"]*)"' % video_id,
+            r'href="(https?://xhamster\.com/(?:movies/{0}/[^"]*\.html|videos/[^/]*-{0})[^"]*)"'.format(video_id),
             webpage, 'xhamster url', default=None)
 
         if not video_url: