Merge remote-tracking branch 'upstream/master' into caption-fix-rebase

Peer5 · May 5, 2017 · 936c731 · 936c731
2 parents 2a51896 + e065694
commit 936c731
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ in a CommonJS app
 ```js
 var videojs = require('video.js');
 require('videojs-contrib-media-sources'); // increase browser support with MSE polyfill
-require('videojs-contrib-hlsjs'); // auto attaches hlsjs handler
+require('videojs-contrib-hls.js'); // auto attaches hlsjs handler
 
 var player = videojs('#player');
 

diff --git a/dist/videojs-contrib-hlsjs.min.js b/dist/videojs-contrib-hlsjs.min.js
diff --git a/dist/videojs-contrib-hlsjs.min.js.map b/dist/videojs-contrib-hlsjs.min.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "videojs-contrib-hls.js",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "hls.js plugin for videojs",
   "main": "dist/videojs-contrib-hlsjs.min.js",
   "directories": {

diff --git a/src/videojs5.hlsjs.js b/src/videojs5.hlsjs.js
@@ -117,11 +117,11 @@ function Html5HlsJS(source, tech) {
   hls.loadSource(source.src);
 }
 
+var hlsTypeRE = /^application\/(x-mpegURL|vnd\.apple\.mpegURL)$/i;
+var hlsExtRE = /\.m3u8/i;
+
 var HlsSourceHandler = {
   canHandleSource: function(source) {
-    var hlsTypeRE = /^application\/x-mpegURL$/i;
-    var hlsExtRE = /\.m3u8/i;
-
     if (source.skipContribHlsJs) {
       return '';
     }
@@ -139,7 +139,6 @@ var HlsSourceHandler = {
     return new Html5HlsJS(source, tech);
   },
   canPlayType: function(type) {
-    var hlsTypeRE = /^application\/x-mpegURL$/i;
     if (hlsTypeRE.test(type)) {
       return 'probably';
     }