From: Philipp Hagemeister <phihag@phihag.de>
Date: Sun, 5 Jan 2014 04:34:06 +0000 (+0100)
Subject: [generic] Support gorillavid.in
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=d981cef6b977ccd070bf2c26f3ec496a95c8f802;p=youtube-dl

[generic] Support gorillavid.in

Previously, we were a little bit over-eager and got a random swf file.
Fixes #2084.
---

diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index 57a6b1820..8534c6f90 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -305,6 +305,9 @@ class GenericIE(InfoExtractor):
 
         # Start with something easy: JW Player in SWFObject
         mobj = re.search(r'flashvars: [\'"](?:.*&)?file=(http[^\'"&]*)', webpage)
+        if mobj is None:
+            # Look for gorilla-vid style embedding
+            mobj = re.search(r'(?s)jw_plugins.*?file:\s*["\'](.*?)["\']', webpage)
         if mobj is None:
             # Broaden the search a little bit
             mobj = re.search(r'[^A-Za-z0-9]?(?:file|source)=(http[^\'"&]*)', webpage)