Skip to content

brainfood / videojs-contrib-hls

Go to a project
Toggle navigation
Toggle navigation pinning
53dbfecf by Gary Katsevman
Options

Merge branch 'master' into withcredentials

2 parents 348ef762 84ea0e16
Inline Side-by-side
Showing 3 changed files with 9 additions and 3 deletions
1 dist/*
2 *~
3 *.iml
4 *.swp
5 tmp/**
6 test/**
...\ No newline at end of file ...\ No newline at end of file
1 [![Build Status](https://travis-ci.org/videojs/videojs-contrib-hls.png)](https://travis-ci.org/videojs/videojs-contrib-hls) 1 [![Build Status](https://travis-ci.org/videojs/videojs-contrib-hls.svg?branch=master)](https://travis-ci.org/videojs/videojs-contrib-hls)
2 2
3 # video.js HLS Plugin 3 # video.js HLS Plugin
4 4
...@@ -47,7 +47,6 @@ support for: ...@@ -47,7 +47,6 @@ support for:
47 - Alternate audio and video tracks 47 - Alternate audio and video tracks
48 - Subtitles 48 - Subtitles
49 - Segment codecs _other than_ H.264 with AAC audio 49 - Segment codecs _other than_ H.264 with AAC audio
50 - Live streams
51 - Internet Explorer < 10 50 - Internet Explorer < 10
52 51
53 ### Runtime Properties 52 ### Runtime Properties
...@@ -119,6 +118,7 @@ bandwidth and viewport dimensions. ...@@ -119,6 +118,7 @@ bandwidth and viewport dimensions.
119 - [Best RESOLUTION variant] OR [Best BANDWIDTH variant] OR [inital playlist in manifest] 118 - [Best RESOLUTION variant] OR [Best BANDWIDTH variant] OR [inital playlist in manifest]
120 119
121 ## Release History 120 ## Release History
121 - 0.4.0: Live stream support
122 - 0.3.0: Performance fixes for high-bitrate streams 122 - 0.3.0: Performance fixes for high-bitrate streams
123 - 0.2.0: Basic playback and adaptive bitrate selection 123 - 0.2.0: Basic playback and adaptive bitrate selection
124 - 0.1.0: Initial release 124 - 0.1.0: Initial release
......
1 { 1 {
2 "name": "videojs-contrib-hls", 2 "name": "videojs-contrib-hls",
3 "version": "0.3.2", 3 "version": "0.4.0",
4 "engines": { 4 "engines": {
5 "node": ">= 0.10.12" 5 "node": ">= 0.10.12"
6 }, 6 },
......