diff options
| author | remitamine <remitamine@gmail.com> | 2015-12-03 20:33:22 +0100 |
|---|---|---|
| committer | remitamine <remitamine@gmail.com> | 2015-12-03 20:33:22 +0100 |
| commit | 78653a33aa00ba5205940c2baac5d9f019795b88 (patch) | |
| tree | 246fd038effd402bc66de4c8afb36e6c318efcaa /youtube_dl/extractor/adultswim.py | |
| parent | 77302fe5c989b9cafcb675c0a03642b80fa557ff (diff) | |
| parent | 24dc1ed715239f85eb3d5f71a707da1dd2bc7773 (diff) | |
Merge remote-tracking branch 'upstream/master' into bliptv
Diffstat (limited to 'youtube_dl/extractor/adultswim.py')
| -rw-r--r-- | youtube_dl/extractor/adultswim.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/youtube_dl/extractor/adultswim.py b/youtube_dl/extractor/adultswim.py index 130afe791..3ae618e71 100644 --- a/youtube_dl/extractor/adultswim.py +++ b/youtube_dl/extractor/adultswim.py @@ -183,7 +183,7 @@ class AdultSwimIE(InfoExtractor): media_url = file_el.text if determine_ext(media_url) == 'm3u8': formats.extend(self._extract_m3u8_formats( - media_url, segment_title, 'mp4', 'm3u8_native', preference=0, m3u8_id='hls')) + media_url, segment_title, 'mp4', preference=0, m3u8_id='hls')) else: formats.append({ 'format_id': '%s_%s' % (bitrate, ftype), |