aboutsummaryrefslogtreecommitdiffstats
path: root/youtube_dl/extractor/afreecatv.py
diff options
context:
space:
mode:
authorsprhawk <465558+sprhawk@users.noreply.github.com>2017-12-26 22:27:26 +0800
committersprhawk <465558+sprhawk@users.noreply.github.com>2017-12-26 22:27:26 +0800
commitc33de004e13da11f1ae3cad7310b36500cfb9d28 (patch)
treec742e448af6c126eca4b259c85f83177aec54847 /youtube_dl/extractor/afreecatv.py
parent42a1012c7767306626c5358a18ad3e86417bd7b7 (diff)
parentdb145ee54a57f5ccc89639de8c589eb111a91b19 (diff)
downloadyoutube-dl-c33de004e13da11f1ae3cad7310b36500cfb9d28.zip
youtube-dl-c33de004e13da11f1ae3cad7310b36500cfb9d28.tar.gz
youtube-dl-c33de004e13da11f1ae3cad7310b36500cfb9d28.tar.bz2
Merge branch 'master' of github.com:rg3/youtube-dl into weibo
Diffstat (limited to 'youtube_dl/extractor/afreecatv.py')
-rw-r--r--youtube_dl/extractor/afreecatv.py17
1 files changed, 13 insertions, 4 deletions
diff --git a/youtube_dl/extractor/afreecatv.py b/youtube_dl/extractor/afreecatv.py
index e6513c7..513dd81 100644
--- a/youtube_dl/extractor/afreecatv.py
+++ b/youtube_dl/extractor/afreecatv.py
@@ -228,10 +228,19 @@ class AfreecaTVIE(InfoExtractor):
r'^(\d{8})_', key, 'upload date', default=None)
file_duration = int_or_none(file_element.get('duration'))
format_id = key if key else '%s_%s' % (video_id, file_num)
- formats = self._extract_m3u8_formats(
- file_url, video_id, 'mp4', entry_protocol='m3u8_native',
- m3u8_id='hls',
- note='Downloading part %d m3u8 information' % file_num)
+ if determine_ext(file_url) == 'm3u8':
+ formats = self._extract_m3u8_formats(
+ file_url, video_id, 'mp4', entry_protocol='m3u8_native',
+ m3u8_id='hls',
+ note='Downloading part %d m3u8 information' % file_num)
+ else:
+ formats = [{
+ 'url': file_url,
+ 'format_id': 'http',
+ }]
+ if not formats:
+ continue
+ self._sort_formats(formats)
file_info = common_entry.copy()
file_info.update({
'id': format_id,