aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/firedrive.py
diff options
context:
space:
mode:
authorrupertbaxter2 <rupertbaxter2@yahoo.com>2014-08-06 16:43:21 -0700
committerrupertbaxter2 <rupertbaxter2@yahoo.com>2014-08-06 16:43:21 -0700
commit0c72eb9060c3f6e20fb9a53be93d256b6947fd65 (patch)
tree4db52decc41be57b66066002f5ec9d2f9d34c51d /youtube_dl/extractor/firedrive.py
parentf9f86b0c645ebef9e68d27086d565eb3c057478f (diff)
parentcccfab64127df3bf8ffa8fd0f4acea786b9ea06a (diff)
downloadyoutube-dl-0c72eb9060c3f6e20fb9a53be93d256b6947fd65.tar.xz
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'youtube_dl/extractor/firedrive.py')
-rw-r--r--youtube_dl/extractor/firedrive.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/youtube_dl/extractor/firedrive.py b/youtube_dl/extractor/firedrive.py
index 6d73c8a4a..af439ccfe 100644
--- a/youtube_dl/extractor/firedrive.py
+++ b/youtube_dl/extractor/firedrive.py
@@ -42,7 +42,6 @@ class FiredriveIE(InfoExtractor):
fields = dict(re.findall(r'''(?x)<input\s+
type="hidden"\s+
name="([^"]+)"\s+
- (?:id="[^"]+"\s+)?
value="([^"]*)"
''', webpage))
@@ -66,7 +65,7 @@ class FiredriveIE(InfoExtractor):
ext = self._search_regex(r'type:\s?\'([^\']+)\',',
webpage, 'extension', fatal=False)
video_url = self._search_regex(
- r'file:\s?\'(http[^\']+)\',', webpage, 'file url')
+ r'file:\s?loadURL\(\'(http[^\']+)\'\),', webpage, 'file url')
formats = [{
'format_id': 'sd',