Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into feature/v1.0.0
* master: (29 commits) when audio level loaded, check if we already know that it's live on level load, check current level details as well as new when determining live-ness Sample AES decryption with 48 AVC Closes: #3102 when audio level loaded, check if we already know that it's live chore(deps): Upgrading TypeScript to 4.0.3. Sample AES decryption with 48 AVC Closes: #3102 Bump chart.js from 2.9.3 to 2.9.4 Bump url-toolkit from 2.2.0 to 2.2.1 Bump mocha from 8.1.3 to 8.2.0 Bump @babel/core from 7.12.1 to 7.12.3 Bump @babel/helper-module-imports from 7.10.4 to 7.12.1 Bump @babel/plugin-proposal-class-properties from 7.10.4 to 7.12.1 Bump @types/chai from 4.2.13 to 4.2.14 Bump @babel/plugin-proposal-object-rest-spread from 7.11.0 to 7.12.1 on level load, check current level details as well as new when determining live-ness Bump @babel/plugin-transform-object-assign from 7.10.4 to 7.12.1 Bump @babel/core from 7.11.6 to 7.12.1 Bump @babel/preset-typescript from 7.10.4 to 7.12.1 Bump @babel/preset-env from 7.11.5 to 7.12.1 Bump @babel/register from 7.11.5 to 7.12.1 ... # Conflicts: # .eslintrc.js # package-lock.json # package.json # src/config.ts # src/controller/audio-stream-controller.js # src/controller/buffer-controller.ts # src/controller/fragment-finders.ts # src/controller/stream-controller.js # src/controller/timeline-controller.ts # src/demux/sample-aes.js # src/loader/fragment.ts # src/loader/m3u8-parser.ts # src/remux/mp4-remuxer.ts # src/types/track.ts # src/utils/timescale-conversion.ts # tests/.eslintrc.js
- Loading branch information