From 67fc365b86dccac4b52c5eb7a3f1e659ef945dc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergey=20M=E2=80=A4?= <dstftw@gmail.com>
Date: Tue, 10 Jan 2017 22:30:47 +0700
Subject: [PATCH] [mtv,cc] Use hls by default (closes #11641)
---
youtube_dl/extractor/comedycentral.py | 2 +-
youtube_dl/extractor/mtv.py | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/youtube_dl/extractor/comedycentral.py b/youtube_dl/extractor/comedycentral.py
index 8bd589774..816e0bfb6 100644
--- a/youtube_dl/extractor/comedycentral.py
+++ b/youtube_dl/extractor/comedycentral.py
@@ -57,7 +57,7 @@ class ComedyCentralFullEpisodesIE(MTVServicesInfoExtractor):
feed = self._download_json(video_zone['feed'], playlist_id)
mgid = feed['result']['data']['id']
- videos_info = self._get_videos_info(mgid, use_hls=True)
+ videos_info = self._get_videos_info(mgid)
return videos_info
diff --git a/youtube_dl/extractor/mtv.py b/youtube_dl/extractor/mtv.py
index 7c45c7738..d27c6686b 100644
--- a/youtube_dl/extractor/mtv.py
+++ b/youtube_dl/extractor/mtv.py
@@ -123,7 +123,7 @@ class MTVServicesInfoExtractor(InfoExtractor):
} for typographic in transcript.findall('./typographic')]
return subtitles
- def _get_video_info(self, itemdoc, use_hls=False):
+ def _get_video_info(self, itemdoc, use_hls=True):
uri = itemdoc.find('guid').text
video_id = self._id_from_uri(uri)
self.report_extraction(video_id)
@@ -193,13 +193,13 @@ class MTVServicesInfoExtractor(InfoExtractor):
data['lang'] = self._LANG
return data
- def _get_videos_info(self, uri, use_hls=False):
+ def _get_videos_info(self, uri, use_hls=True):
video_id = self._id_from_uri(uri)
feed_url = self._get_feed_url(uri)
info_url = update_url_query(feed_url, self._get_feed_query(uri))
return self._get_videos_info_from_url(info_url, video_id, use_hls)
- def _get_videos_info_from_url(self, url, video_id, use_hls=False):
+ def _get_videos_info_from_url(self, url, video_id, use_hls=True):
idoc = self._download_xml(
url, video_id,
'Downloading info', transform_source=fix_xml_ampersands)