From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 30 Jan 2014 04:29:09 +0000 (+0100)
Subject: [generic] Match JWPlayerOptions
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=9f8928d0320e59eca5802d15161dfe1090dd2c61;p=youtube-dl

[generic] Match JWPlayerOptions

This adds support for The Guardian, among others
Closes #2271, fixes #2267
---

diff --git a/youtube_dl/extractor/generic.py b/youtube_dl/extractor/generic.py
index e0d51996d..88d768bdd 100644
--- a/youtube_dl/extractor/generic.py
+++ b/youtube_dl/extractor/generic.py
@@ -358,7 +358,7 @@ class GenericIE(InfoExtractor):
         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)
+            mobj = re.search(r'(?s)(?:jw_plugins|JWPlayerOptions).*?file\s*:\s*["\'](.*?)["\']', webpage)
         if mobj is None:
             # Broaden the search a little bit
             mobj = re.search(r'[^A-Za-z0-9]?(?:file|source)=(http[^\'"&]*)', webpage)