projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'duncankl/airmozilla'
[youtube-dl]
/
youtube_dl
/
extractor
/
gdcvault.py
diff --git
a/youtube_dl/extractor/gdcvault.py
b/youtube_dl/extractor/gdcvault.py
index fed968f5179ebf6159212da5ab75b024b3bc0a03..f7b467b0aff8f46aa028d1898f5909277e973318 100644
(file)
--- a/
youtube_dl/extractor/gdcvault.py
+++ b/
youtube_dl/extractor/gdcvault.py
@@
-7,6
+7,7
@@
from ..compat import (
compat_urllib_parse,
compat_urllib_request,
)
compat_urllib_parse,
compat_urllib_request,
)
+from ..utils import remove_end
class GDCVaultIE(InfoExtractor):
class GDCVaultIE(InfoExtractor):
@@
-65,10
+66,12
@@
class GDCVaultIE(InfoExtractor):
def _parse_flv(self, xml_description):
video_formats = []
def _parse_flv(self, xml_description):
video_formats = []
- akami_url = xml_description.find('./metadata/akamaiHost').text
+ akam
a
i_url = xml_description.find('./metadata/akamaiHost').text
slide_video_path = xml_description.find('./metadata/slideVideo').text
video_formats.append({
slide_video_path = xml_description.find('./metadata/slideVideo').text
video_formats.append({
- 'url': 'rtmp://' + akami_url + '/' + slide_video_path,
+ 'url': 'rtmp://%s/ondemand?ovpfv=1.1' % akamai_url,
+ 'play_path': remove_end(slide_video_path, '.flv'),
+ 'ext': 'flv',
'format_note': 'slide deck video',
'quality': -2,
'preference': -2,
'format_note': 'slide deck video',
'quality': -2,
'preference': -2,
@@
-76,7
+79,9
@@
class GDCVaultIE(InfoExtractor):
})
speaker_video_path = xml_description.find('./metadata/speakerVideo').text
video_formats.append({
})
speaker_video_path = xml_description.find('./metadata/speakerVideo').text
video_formats.append({
- 'url': 'rtmp://' + akami_url + '/' + speaker_video_path,
+ 'url': 'rtmp://%s/ondemand?ovpfv=1.1' % akamai_url,
+ 'play_path': remove_end(speaker_video_path, '.flv'),
+ 'ext': 'flv',
'format_note': 'speaker video',
'quality': -1,
'preference': -1,
'format_note': 'speaker video',
'quality': -1,
'preference': -1,