Skip to content

Commit dd6c6ca

Browse files
authored
Merge pull request #185 from kjmalek/hls.js
Replace video.js library with hls.js for HLS playback
2 parents c03c144 + aeaff32 commit dd6c6ca

File tree

5 files changed

+189
-1870
lines changed

5 files changed

+189
-1870
lines changed

system/application/views/widgets/api/scalarapi.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -323,13 +323,13 @@ function ScalarAPI() {
323323
isProprietary:false,
324324
contentType:'video',
325325
browserSupport: {
326-
'Mozilla': {extensions:['m3u8'], format:'M3U8', player:'VideoJS', specifiesDimensions:true},
327-
'Explorer': {extensions:['m3u8'], format:'M3U8', player:'VideoJS', specifiesDimension:true},
326+
'Mozilla': {extensions:['m3u8'], format:'M3U8', player:'HLS', specifiesDimensions:true},
327+
'Explorer': {extensions:['m3u8'], format:'M3U8', player:'HLS', specifiesDimension:true},
328328
'MobileSafari': {extensions:['m3u8'], format:'M3U8', player:'native', specifiesDimensions:true},
329329
'Safari': {extensions:['m3u8'], format:'M3U8', player:'native', specifiesDimensions:true},
330-
'Chrome': {extensions:['m3u8'], format:'M3U8', player:'VideoJS', specifiesDimensions:true},
331-
'Android': {extensions:['m3u8'], format:'M3U8', player:'VideoJS', specifiesDimensions:true},
332-
'Other': {extensions:['m3u8'], format:'M3U8', player:'VideoJS', specifiesDimensions:true}
330+
'Chrome': {extensions:['m3u8'], format:'M3U8', player:'HLS', specifiesDimensions:true},
331+
'Android': {extensions:['m3u8'], format:'M3U8', player:'HLS', specifiesDimensions:true},
332+
'Other': {extensions:['m3u8'], format:'M3U8', player:'HLS', specifiesDimensions:true}
333333
}},
334334
'HyperCities': {
335335
name:'HyperCities',

system/application/views/widgets/mediaelement/hls.min.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)