X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fadobetv.py;h=5ae16fa16809b557e74e133a4a7811d396b1c2c2;hb=b4173f1551c47f64745cb91451c46891e2aaac16;hp=d658269323800f5ee925d3e330e87b37b4e07413;hpb=2c3b9f35703def516e455448666af0b4c5b31ec9;p=youtube-dl

diff --git a/youtube_dl/extractor/adobetv.py b/youtube_dl/extractor/adobetv.py
index d65826932..5ae16fa16 100644
--- a/youtube_dl/extractor/adobetv.py
+++ b/youtube_dl/extractor/adobetv.py
@@ -3,6 +3,7 @@ from __future__ import unicode_literals
 import re
 
 from .common import InfoExtractor
+from ..compat import compat_str
 from ..utils import (
     parse_duration,
     unified_strdate,
@@ -55,7 +56,7 @@ class AdobeTVIE(AdobeTVBaseIE):
         self._sort_formats(formats)
 
         return {
-            'id': str(video_data['id']),
+            'id': compat_str(video_data['id']),
             'title': video_data['title'],
             'description': video_data.get('description'),
             'thumbnail': video_data.get('thumbnail'),
@@ -105,7 +106,7 @@ class AdobeTVShowIE(AdobeTVPlaylistBaseIE):
 
         return self.playlist_result(
             self._extract_playlist_entries(self._API_BASE_URL + 'episode/?%s' % query, show_urlname),
-            str(show_data['id']),
+            compat_str(show_data['id']),
             show_data['show_name'],
             show_data['show_description'])
 
@@ -155,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')),