From: Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>
Date: Tue, 25 Jun 2013 20:07:31 +0000 (+0200)
Subject: Merge pull request #922 from JohnyMoSwag/master
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=a545d1d2625081ab92a5223efdd42c1fddb87b58;hp=037fcd00470044b90566899ed0f9b9491cae0b8e;p=youtube-dl

Merge pull request #922 from JohnyMoSwag/master

Added embedded youtube detection to WorldstarIE
---

diff --git a/youtube_dl/extractor/worldstarhiphop.py b/youtube_dl/extractor/worldstarhiphop.py
index 54a77b696..531d0889f 100644
--- a/youtube_dl/extractor/worldstarhiphop.py
+++ b/youtube_dl/extractor/worldstarhiphop.py
@@ -16,6 +16,10 @@ class WorldStarHipHopIE(InfoExtractor):
         video_url = self._search_regex(r'so\.addVariable\("file","(.*?)"\)',
             webpage_src, u'video URL')
 
+        if 'youtube' in video_url:
+            self.to_screen(u'Youtube video detected:')
+            return self.url_result(video_url, ie='Youtube')
+
         if 'mp4' in video_url:
             ext = 'mp4'
         else: