diff options
| author | Philipp Hagemeister <phihag@phihag.de> | 2013-10-28 10:44:13 +0100 |
|---|---|---|
| committer | Philipp Hagemeister <phihag@phihag.de> | 2013-10-28 10:44:13 +0100 |
| commit | ebc14f251c2968f4cb6cb18610b857ecb24348c8 (patch) | |
| tree | d33050d96f576d2a9710ccea7fac729116358025 /youtube_dl/extractor/common.py | |
| parent | d41e6efc852c34da582790a54ecc4f5e9dbbedda (diff) | |
| parent | 8ffa13e03e995f2009d8240cbdc6ba7aba9d3759 (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'youtube_dl/extractor/common.py')
| -rw-r--r-- | youtube_dl/extractor/common.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index 458635f1e..ce349fe20 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -330,10 +330,10 @@ class InfoExtractor(object): def _og_search_title(self, html, **kargs): return self._og_search_property('title', html, **kargs) - def _og_search_video_url(self, html, name='video url', **kargs): - return self._html_search_regex([self._og_regex('video:secure_url'), - self._og_regex('video')], - html, name, **kargs) + def _og_search_video_url(self, html, name='video url', secure=True, **kargs): + regexes = [self._og_regex('video')] + if secure: regexes.insert(0, self._og_regex('video:secure_url')) + return self._html_search_regex(regexes, html, name, **kargs) def _rta_search(self, html): # See http://www.rtalabel.org/index.php?content=howtofaq#single |