Merge tag 'upstream/2016.02.22'

[youtubedl] / youtube_dl / extractor / archiveorg.py

diff --git a/youtube_dl/extractor/archiveorg.py b/youtube_dl/extractor/archiveorg.py
index 9fc35a42b8612d828ccc3ae43c9e4f74782f5352..8feb7cb7456ec4db8d6a8f28b411a58cb5ac47a1 100644 (file)
--- a/youtube_dl/extractor/archiveorg.py
+++ b/youtube_dl/extractor/archiveorg.py
@@ -33,7 +33,7 @@ class ArchiveOrgIE(InfoExtractor):
     def _real_extract(self, url):
         video_id = self._match_id(url)
 
     def _real_extract(self, url):
         video_id = self._match_id(url)
 

-        json_url = url + ('?' if '?' in url else '&') + 'output=json'
+        json_url = url + ('&' if '?' in url else '?') + 'output=json'

         data = self._download_json(json_url, video_id)
 
         def get_optional(data_dict, field):
         data = self._download_json(json_url, video_id)
 
         def get_optional(data_dict, field):