Merge branch 'miaopai' of https://github.com/xyb/youtube-dl into xyb-miaopai

[youtube-dl] / youtube_dl / extractor / cartoonnetwork.py

diff --git a/youtube_dl/extractor/cartoonnetwork.py b/youtube_dl/extractor/cartoonnetwork.py
index 813f5364428c1049c5d765384a692a6a5ad54395..688a6375e2d66f490a0c3e2d9f706c44bd889e2f 100644 (file)
--- a/youtube_dl/extractor/cartoonnetwork.py
+++ b/youtube_dl/extractor/cartoonnetwork.py
@@ -28,9 +28,9 @@ class CartoonNetworkIE(TurnerBaseIE):
         id_type, video_id = re.search(r"_cnglobal\.cvp(Video|Title)Id\s*=\s*'([^']+)';", webpage).groups()
         query = ('id' if id_type == 'Video' else 'titleId') + '=' + video_id
         return self._extract_cvp_info(
-            'http://www.cartoonnetwork.com/video-seo-svc/episodeservices/getCvpPlaylist?' + query, video_id, {
+            'http://www.cartoonnetwork.com/video-seo-svc/episodeservices/getCvpPlaylist?networkName=CN2&' + query, video_id, {
                 'secure': {
-                    'media_src': 'http://apple-secure.cdn.turner.com/toon/big',
+                    'media_src': 'http://androidhls-secure.cdn.turner.com/toon/big',
                     'tokenizer_src': 'http://www.cartoonnetwork.com/cntv/mvpd/processors/services/token_ipadAdobe.do',
                 },
             })