videojs · forbesjo · Jan 30, 2018 · Jan 29, 2018 · Jan 29, 2018 · Jan 29, 2018
diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ Maintenance Status: Stable
 - [Contributing](#contributing)
 - [Talk to us](#talk-to-us)
 - [Getting Started](#getting-started)
-  - [Video.js 6](#videojs-6)
+  - [Flash Support](#flash-support)
 - [Documentation](#documentation)
   - [Options](#options)
     - [How to use](#how-to-use)
@@ -60,8 +60,6 @@ Maintenance Status: Stable
   - [Segment Metadata](#segment-metadata)
 - [Hosting Considerations](#hosting-considerations)
 - [Known Issues](#known-issues)
-  - [IE10 and Below](#ie10-and-below)
-  - [IE11](#ie11)
   - [Fragmented MP4 Support](#fragmented-mp4-support)
 - [Testing](#testing)
 - [Debugging](#debugging)
@@ -115,21 +113,9 @@ player.play();
 
 Check out our [live example](http://jsbin.com/vokipos/8/edit?html,output) if you're having trouble.
 
-### Video.js 6
-With Video.js 6, by default there is no flash support. Instead, flash support is provided
-through the [videojs-flash](https://github.com/videojs/videojs-flash) plugin. If you are
-trying to use Video.js version 6 and want to include flash support, you must include
-[videojs-flash](https://github.com/videojs/videojs-flash) on your page before including
-videojs-http-streaming
-
-```html
-<script src="https://unpkg.com/videojs-flash/dist/videojs-flash.js"></script>
-<script src="https://unpkg.com/@videojs/http-streaming/dist/videojs-http-streaming.js"></script>
-```
-
-Flash, and the [videojs-flash](https://github.com/videojs/videojs-flash) plugin, are not
-required, but are recommended as a fallback option for browsers that don't have a native
-HLS player or support for [Media Source Extensions](http://caniuse.com/#feat=mediasource).
+### Flash Support
+This plugin does not support Flash playback. Instead, it is recommended that users use the [videojs-flashls-source-handler](https://github.com/brightcove/videojs-flashls-source-handler) plugin as a fallback option for browsers that don't have a native
+[HLS](https://caniuse.com/#feat=http-live-streaming)/[DASH](https://caniuse.com/#feat=mpeg-dash) player or support for [Media Source Extensions](http://caniuse.com/#feat=mediasource).
 
 ## Documentation
 [HTTP Live Streaming](https://developer.apple.com/streaming/) (HLS) has
@@ -150,8 +136,8 @@ the best desktop viewing experience.
 
 This project addresses that situation by providing a polyfill for HLS
 on browsers that have support for [Media Source
-Extensions](http://caniuse.com/#feat=mediasource), or failing that,
-support Flash. You can deploy a single HLS stream, code against the
+Extensions](http://caniuse.com/#feat=mediasource).
+You can deploy a single HLS stream, code against the
 regular HTML5 video APIs, and create a fast, high-quality video
 experience across all the big web device categories.
 
@@ -203,20 +189,11 @@ videojs(video, {html5: {
 
 // or
 
-// flash for flash hls
-videojs(video, {flash: {
-  hls: {
-    withCredentials: true
-  }
-}});
-
-// or
-
 var options = {hls: {
   withCredentials: true;
 }};
 
-videojs(video, {flash: options, html5: options});
+videojs(video, {html5: options});
 
 ```
 
@@ -652,18 +629,9 @@ and most CDNs should have no trouble turning CORS on for your account.
 
 
 ## Known Issues
-Issues that are currenty know about with workarounds. If you want to
+Issues that are currenty known with workarounds. If you want to
 help find a solution that would be appreciated!
 
-### IE10 and Below
-As of version 5.0.0, IE10 and below are no longer supported.
-
-### IE11
-In some IE11 setups there are issues working with its native HTML
-SourceBuffers functionality. This leads to various issues, such as
-videos stopping playback with media decode errors. The known workaround
-for this issues is to force the player to use flash when running on IE11.
-
 ### Fragmented MP4 Support
 Edge has native support for HLS but only in the MPEG2-TS container. If
 you attempt to play an HLS stream with fragmented MP4 segments, Edge

diff --git a/index.html b/index.html
@@ -26,8 +26,7 @@
 </head>
 <body>
   <div class="info">
-    <p>The video below is an <a href="https://developer.apple.com/library/ios/documentation/networkinginternet/conceptual/streamingmediaguide/Introduction/Introduction.html#//apple_ref/doc/uid/TP40008332-CH1-SW1">HTTP Live Stream</a>. On desktop browsers other than Safari, the HLS plugin will polyfill support for the format on top of the video.js Flash tech.</p>
-    <p>Due to security restrictions in Flash, you will have to load this page over HTTP(S) to see the example in action.</p>
+    <p>The video below is an <a href="https://developer.apple.com/library/ios/documentation/networkinginternet/conceptual/streamingmediaguide/Introduction/Introduction.html#//apple_ref/doc/uid/TP40008332-CH1-SW1">HTTP Live Stream</a>.</p>
   </div>
   <video id="videojs-http-streaming-player" class="video-js vjs-default-skin" controls>
     <source src="https://d2zihajmogu5jn.cloudfront.net/bipbop-advanced/bipbop_16x9_variant.m3u8" type="application/x-mpegURL">

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -91,7 +91,6 @@
     "mux.js": "4.3.2",
     "url-toolkit": "^2.1.3",
     "video.js": "^6.2.0",
-    "videojs-contrib-media-sources": "4.6.2",
     "webworkify": "1.0.2"
   },
   "devDependencies": {
@@ -132,7 +131,6 @@
     "uglify-js": "^2.5.0",
     "videojs-contrib-eme": "^3.0.0",
     "videojs-contrib-quality-levels": "^2.0.2",
-    "videojs-flash": "^2.0.0",
     "videojs-standard": "^4.0.3",
     "videojs-swf": "^5.2.0",
     "watchify": "^3.6.0",

diff --git a/src/master-playlist-controller.js b/src/master-playlist-controller.js
@@ -55,7 +55,6 @@ export class MasterPlaylistController extends videojs.EventTarget {
     let {
       url,
       withCredentials,
-      mode,
       tech,
       bandwidth,
       externHls,
@@ -74,7 +73,6 @@ export class MasterPlaylistController extends videojs.EventTarget {
     this.withCredentials = withCredentials;
     this.tech_ = tech;
     this.hls_ = tech.hls;
-    this.mode_ = mode;
     this.sourceType_ = sourceType;
     this.useCueTags_ = useCueTags;
     this.blacklistDuration = blacklistDuration;
@@ -92,7 +90,7 @@ export class MasterPlaylistController extends videojs.EventTarget {
 
     this.mediaTypes_ = createMediaTypes();
 
-    this.mediaSource = new videojs.MediaSource({ mode });
+    this.mediaSource = new videojs.MediaSource();
 
     // load the media source into the player
     this.mediaSource.addEventListener('sourceopen', this.handleSourceOpen_.bind(this));
@@ -194,7 +192,6 @@ export class MasterPlaylistController extends videojs.EventTarget {
         tech: this.tech_,
         requestOptions: this.requestOptions_,
         masterPlaylistLoader: this.masterPlaylistLoader_,
-        mode: this.mode_,
         hls: this.hls_,
         master: this.master(),
         mediaTypes: this.mediaTypes_,
@@ -560,7 +557,6 @@ export class MasterPlaylistController extends videojs.EventTarget {
       }
 
       if (videojs.browser.IE_VERSION &&
-          this.mode_ === 'html5' &&
           this.tech_.readyState() === 0) {
         // IE11 throws an InvalidStateError if you try to set currentTime while the
         // readyState is 0, so it must be delayed until the tech fires loadedmetadata.
@@ -768,7 +764,8 @@ export class MasterPlaylistController extends videojs.EventTarget {
     // In flash playback, the segment loaders should be reset on every seek, even
     // in buffer seeks. If the seek location is already buffered, continue buffering as
     // usual
-    if (buffered && buffered.length && this.mode_ !== 'flash') {
+    // TODO: redo this comment
+    if (buffered && buffered.length) {
       return currentTime;
     }
 

diff --git a/src/media-groups.js b/src/media-groups.js
@@ -350,7 +350,6 @@ export const initialize = {
    */
   'AUDIO': (type, settings) => {
     const {
-      mode,
       hls,
       sourceType,
       segmentLoaders: { [type]: segmentLoader },
@@ -364,12 +363,9 @@ export const initialize = {
       }
     } = settings;
 
-    // force a default if we have none or we are not
-    // in html5 mode (the only mode to support more than one
-    // audio track)
+    // force a default if we have none
     if (!mediaGroups[type] ||
-        Object.keys(mediaGroups[type]).length === 0 ||
-        mode !== 'html5') {
+        Object.keys(mediaGroups[type]).length === 0) {
       mediaGroups[type] = { main: { default: { default: true } } };
     }
 
@@ -671,8 +667,6 @@ export const activeTrack = {
  *        XHR request options used by the segment loaders
  * @param {PlaylistLoader} settings.masterPlaylistLoader
  *        PlaylistLoader for the master source
- * @param {String} mode
- *        Mode of the hls source handler. Can be 'auto', 'html5', or 'flash'
  * @param {HlsHandler} settings.hls
  *        HLS SourceHandler
  * @param {Object} settings.master