[generic] Prevent <video> search from skipping over empty sources (#3546)

This commit is contained in:
Philipp Hagemeister 2014-08-27 02:09:59 +02:00
parent 1cb6dcdbbe
commit aff216edf4

View file

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