Skip to content

Correct instantiation of HttpVideoSource with no content protection. #292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joeyparrish merged 1 commit into from
Feb 27, 2016
Merged

Correct instantiation of HttpVideoSource with no content protection. #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
};

Expand Down
3 changes: 1 addition & 2 deletions lib/player/http_video_source.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down