milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #874 from MrTimscampi/octopus

Browse source 
Use forked version of JavascriptSubtitlesOctopus
This commit is contained in:
Vasily 2020-03-03 14:32:06 +03:00 • committed by GitHub
commit 9162f53b98
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/components/htmlvideoplayer/plugin.js
View file

@ -1056,8 +1056,9 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
return i.DeliveryUrl;
}),
workerUrl: appRouter.baseUrl() + "/libraries/subtitles-octopus-worker.js",
legacyWorkerUrl: appRouter.baseUrl() + "/libraries/subtitles-octopus-worker-legacy.js",
onError: function() {
htmlMediaHelper.onErrorInternal(self, 'mediadecodeerror')
htmlMediaHelper.onErrorInternal(self, 'mediadecodeerror');
}
};
require(['JavascriptSubtitlesOctopus'], function(SubtitlesOctopus) {