Merge remote-tracking branch 'origin/master'

master
Philipp Hagemeister 10 years ago
commit 426b52fc5d
  1. 2
      youtube_dl/extractor/generic.py

@ -672,7 +672,7 @@ class GenericIE(InfoExtractor):
# HTML5 video
found = re.findall(r'(?s)<video[^<]*(?:>.*?<source.*?)? src="([^"]+)"', webpage)
if not found:
found = re.findall(
found = re.search(
r'(?i)<meta\s+(?=(?:[a-z-]+="[^"]+"\s+)*http-equiv="refresh")'
r'(?:[a-z-]+="[^"]+"\s+)*?content="[0-9]{,2};url=\'([^\']+)\'"',
webpage)

Loading…
Cancel
Save