From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Sat, 18 Jun 2016 04:21:40 +0000 (+0800)
Subject: [adobetv] Use embedded data in the webpage
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=26264cb0566309bcdc7f0f2a8ee376bf205fc675;p=youtube-dl

[adobetv] Use embedded data in the webpage

Sometimes the HTML webpage is returned even with '?format=json'
---

diff --git a/youtube_dl/extractor/adobetv.py b/youtube_dl/extractor/adobetv.py
index 8753ee2cf..5ae16fa16 100644
--- a/youtube_dl/extractor/adobetv.py
+++ b/youtube_dl/extractor/adobetv.py
@@ -156,7 +156,10 @@ class AdobeTVVideoIE(InfoExtractor):
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
-        video_data = self._download_json(url + '?format=json', video_id)
+        webpage = self._download_webpage(url, video_id)
+
+        video_data = self._parse_json(self._search_regex(
+            r'var\s+bridge\s*=\s*([^;]+);', webpage, 'bridged data'), video_id)
 
         formats = [{
             'format_id': '%s-%s' % (determine_ext(source['src']), source.get('height')),