diff --git a/CHANGELOG.md b/CHANGELOG.md index f771ea3fe..feb45d2fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -61,6 +61,7 @@ CHANGELOG * @pavelhoral fixed subclassing without a constructor ([view](https://github.com/videojs/video.js/pull/2308)) * @dmlap fixed a vjs_getProperty error caused by a progress check before the swf was ready ([view](https://github.com/videojs/video.js/pull/2316)) * @dmlap exported the videojs.log function ([view](https://github.com/videojs/video.js/pull/2317)) +* @gkatsev updated vttjs to fix a trailing comma JSON error ([view](https://github.com/videojs/video.js/pull/2331)) -------------------- diff --git a/package.json b/package.json index ffa13c900..9eb9acb62 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "videojs-font": "1.3.0", "videojs-ie8": "1.1.0", "videojs-swf": "4.7.1", - "vtt.js": "git+https://github.com/gkatsev/vtt.js.git#shim-build" + "vtt.js": "git+https://github.com/gkatsev/vtt.js.git#vjs-v0.12.1" }, "devDependencies": { "babel": "^5.2.2",