aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/globo.py
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2015-12-29 00:58:24 +0600
committerSergey M․ <dstftw@gmail.com>2015-12-29 00:58:24 +0600
commit7e5edcfd333f05c610bd70c33f3d3fd0ff6a7cec (patch)
treecdb7507ea699e228587c945d24c38b716d696216 /youtube_dl/extractor/globo.py
parent39d60b715a75e92d169167876bb07424301c0b67 (diff)
Simplify formats accumulation for f4m/m3u8/smil formats
Now all _extract_*_formats routines return a list
Diffstat (limited to 'youtube_dl/extractor/globo.py')
-rw-r--r--youtube_dl/extractor/globo.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/youtube_dl/extractor/globo.py b/youtube_dl/extractor/globo.py
index c65ef6bcf..b241c4868 100644
--- a/youtube_dl/extractor/globo.py
+++ b/youtube_dl/extractor/globo.py
@@ -369,11 +369,9 @@ class GloboIE(InfoExtractor):
resource_url = resource['url']
signed_url = '%s?h=%s&k=%s' % (resource_url, signed_hash, 'flash')
if resource_id.endswith('m3u8') or resource_url.endswith('.m3u8'):
- m3u8_formats = self._extract_m3u8_formats(
+ formats.extend(self._extract_m3u8_formats(
signed_url, resource_id, 'mp4', entry_protocol='m3u8_native',
- m3u8_id='hls', fatal=False)
- if m3u8_formats:
- formats.extend(m3u8_formats)
+ m3u8_id='hls', fatal=False))
else:
formats.append({
'url': signed_url,