aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/ooyala.py
diff options
context:
space:
mode:
authorremitamine <remitamine@gmail.com>2015-10-16 10:12:42 +0100
committerremitamine <remitamine@gmail.com>2015-10-16 10:12:42 +0100
commitdd414c970bcc493358ff6a76f6544a0417125594 (patch)
tree6e670ec73bd693c225d98776c541b2d79993483f /youtube_dl/extractor/ooyala.py
parent497ca088a60fdd0a98f16e22a9d4fec135a26ab0 (diff)
[ooyala] fix sorting and format id
Diffstat (limited to 'youtube_dl/extractor/ooyala.py')
-rw-r--r--youtube_dl/extractor/ooyala.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/youtube_dl/extractor/ooyala.py b/youtube_dl/extractor/ooyala.py
index df99a39f4..075b594ce 100644
--- 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':
- 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':
- 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'),
- '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')),