Merge pull request #292 from sanbornhnewyyz/master

Correct instantiation of HttpVideoSource with no content protection.
shaka-project · Feb 27, 2016 · 96bf5b2 · 96bf5b2
2 parents 6a8a64c + b6b8689
commit 96bf5b2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/app.js b/app.js
@@ -699,7 +699,7 @@ app.loadHttpStream = function() {
   var subtitlesUrl = document.getElementById('subtitlesUrlInput').value;
   var config = keySystem ?
                {'keySystem': keySystem, 'licenseServerUrl': licenseServerUrl} :
-               {};
+               {'keySystem': ''};
   app.load_(new shaka.player.HttpVideoSource(mediaUrl, subtitlesUrl, config));
 };
 

diff --git a/lib/player/http_video_source.js b/lib/player/http_video_source.js
@@ -33,8 +33,7 @@ goog.require('shaka.util.StringUtils');
  * Creates an HttpVideoSource.
  * @param {string} mediaUrl The media URL.
  * @param {string} textUrl The text URL, or empty string if no subtitles.
- * @param {shaka.player.DrmInfo.Config} drmInfoConfig A DrmInfo Config object,
- *     an empty object indicates unencrypted content.
+ * @param {shaka.player.DrmInfo.Config} drmInfoConfig A DrmInfo Config object.
  * @struct
  * @constructor
  * @implements {shaka.player.IVideoSource}