projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
497ca08
)
[ooyala] fix sorting and format id
author
remitamine
<remitamine@gmail.com>
Fri, 16 Oct 2015 09:12:42 +0000
(10:12 +0100)
committer
remitamine
<remitamine@gmail.com>
Fri, 16 Oct 2015 09:12:42 +0000
(10:12 +0100)
youtube_dl/extractor/ooyala.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/ooyala.py
b/youtube_dl/extractor/ooyala.py
index df99a39f4c812e94daaf8f631da9567fea545c1a..075b594ce6ba2df0ed5519b7f45718f518aafea3 100644
(file)
--- a/
youtube_dl/extractor/ooyala.py
+++ b/
youtube_dl/extractor/ooyala.py
@@
-39,15
+39,15
@@
class OoyalaBaseIE(InfoExtractor):
video_info['url'] = url
return video_info
if delivery_type == 'hls':
video_info['url'] = url
return video_info
if delivery_type == 'hls':
- formats.extend(self._extract_m3u8_formats(url, embed_code, 'mp4', 'm3u8_native',
0,
m3u8_id='hls', fatal=False))
+ formats.extend(self._extract_m3u8_formats(url, embed_code, 'mp4', 'm3u8_native', m3u8_id='hls', fatal=False))
elif delivery_type == 'hds':
elif delivery_type == 'hds':
- formats.extend(self._extract_f4m_formats(url, embed_code,
f4m_id=
'hds', fatal=False))
+ formats.extend(self._extract_f4m_formats(url, embed_code,
-1,
'hds', fatal=False))
else:
formats.append({
'url': url,
'ext': stream.get('delivery_type'),
'vcodec': stream.get('video_codec'),
else:
formats.append({
'url': url,
'ext': stream.get('delivery_type'),
'vcodec': stream.get('video_codec'),
- 'format_id':
stream.get('profile'
),
+ 'format_id':
'%s-%s-%sp' % (stream.get('profile'), delivery_type, stream.get('height')
),
'width': int_or_none(stream.get('width')),
'height': int_or_none(stream.get('height')),
'abr': int_or_none(stream.get('audio_bitrate')),
'width': int_or_none(stream.get('width')),
'height': int_or_none(stream.get('height')),
'abr': int_or_none(stream.get('audio_bitrate')),