ad2140d0 by David LaPalomento

Merge branch 'dmlap-ignore-nit'

2 parents 29963166 1f1993b6
......@@ -9,6 +9,7 @@ CHANGELOG
* @mikrohard: wait for an SPS to inject metadata tags. ([view](https://github.com/videojs/videojs-contrib-hls/pull/280))
* @mikrohard: Trim whitespace in playlist. ([view](https://github.com/videojs/videojs-contrib-hls/pull/282))
* @dmlap add a contrib option to merge PRs without squashing ([view](https://github.com/videojs/videojs-contrib-hls/pull/287))
* @mikrohard allow playback of TS files with NITs. Don't warn about PCR PIDs. ([view](https://github.com/videojs/videojs-contrib-hls/pull/284))
--------------------
......