Merge branch 'stable'

Conflicts: dist/video-js/video-js.css dist/video-js/video-js.min.css dist/video-js/video-js.swf dist/video-js/video.js
videojs · Sep 25, 2014 · 2a71d69 · 2a71d69
2 parents a2710b6 + c0518a1
commit 2a71d69
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,9 @@ CHANGELOG
 
 --------------------
 
+## 4.8.5 (2014-09-25)
+* Updated to the latest version of the swf to fix HLS playback ([view](https://github.com/videojs/video.js/pull/1538))
+
 ## 4.8.4 (2014-09-23)
 * @gkatsev fixed isFullscreen reporting on iOS devices ([view](https://github.com/videojs/video.js/pull/1511))
 

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "video.js",
   "description": "An HTML5 and Flash video player with a common API and skin for both.",
-  "version": "4.8.4",
+  "version": "4.8.5",
   "main": [
     "dist/video-js/video.js",
     "dist/video-js/video-js.css"

diff --git a/component.json b/component.json
@@ -1,7 +1,7 @@
 {
   "name": "video.js",
   "description": "An HTML5 and Flash video player with a common API and skin for both.",
-  "version": "4.8.4",
+  "version": "4.8.5",
   "keywords": [
     "videojs",
     "html5",

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "video.js",
   "description": "An HTML5 and Flash video player with a common API and skin for both.",
-  "version": "4.8.4",
+  "version": "4.8.5",
   "copyright": "Copyright 2014 Brightcove, Inc. https://github.com/videojs/video.js/blob/master/LICENSE",
   "keywords": [
     "videojs",
@@ -21,7 +21,7 @@
   },
   "main": "./dist/video-js/video.js",
   "dependencies": {
-    "videojs-swf": "4.4.4"
+    "videojs-swf": "4.4.5"
   },
   "devDependencies": {
     "calcdeps": "~0.1.7",