From: Sergey M. <dstftw@gmail.com>
Date: Thu, 24 Sep 2015 22:26:07 +0000 (+0600)
Subject: Merge pull request #6955 from atomic83/patch-1
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=80faa7a152415f4cd7264055745e37935c667e72;hp=caedb0721e24023df2d8a385c64bd0ef67bc7081;p=youtube-dl

Merge pull request #6955 from atomic83/patch-1

More title extraction fixing.
---

diff --git a/youtube_dl/extractor/xhamster.py b/youtube_dl/extractor/xhamster.py
index f12fe13b1..8938c0e45 100644
--- a/youtube_dl/extractor/xhamster.py
+++ b/youtube_dl/extractor/xhamster.py
@@ -64,7 +64,7 @@ class XHamsterIE(InfoExtractor):
         webpage = self._download_webpage(mrss_url, video_id)
 
         title = self._html_search_regex(
-            [r'<title>(?P<title>.+?)(?:, Free Porn: xHamster| - xHamster\.com)</title>',
+            [r'<title>(?P<title>.+?)(?:, (?:[^,]+? )?Porn: xHamster| - xHamster\.com)</title>',
              r'<h1>([^<]+)</h1>'], webpage, 'title')
 
         # Only a few videos have an description