projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
3effa7c
)
Merge branch 'master' of github.com:rg3/youtube-dl
author
Philipp Hagemeister
<phihag@phihag.de>
Thu, 30 Jan 2014 04:30:16 +0000
(
05:30
+0100)
committer
Philipp Hagemeister
<phihag@phihag.de>
Thu, 30 Jan 2014 04:30:16 +0000
(
05:30
+0100)
youtube_dl/extractor/generic.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/generic.py
b/youtube_dl/extractor/generic.py
index e0d51996ded5f1604bebe5d0c03c1dbc815f31ce..88d768bddce9165e8c10c0a313fdf29dfa7a0258 100644
(file)
--- 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)