Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/video-dev/hls.js into fea…
Browse files Browse the repository at this point in the history
…ture/v1.0.0

* 'master' of https://github.com/video-dev/hls.js:
  Fix issue in TS Demuxer that skipped AAC frames at the end of PES packets Fixes #2528
  Update dependencies and package-lock
  Fix formatting in README example
  Fix: Don't seek back from media.currentTime with computeLivePosition
  load audio playlist on MANIFEST_PARSED
  tsdemuxer: if PES does not contain PTS/DTS, use last PES PTS/DTS instead
  • Loading branch information
Rob Walch committed Feb 27, 2020
2 parents ba07abc + 88c4ed0 commit 43e57ca
Show file tree
Hide file tree
Showing 7 changed files with 12,007 additions and 10,762 deletions.
6 changes: 3 additions & 3 deletions README.md
Expand Up @@ -63,11 +63,11 @@ Find the commit on [https://github.com/video-dev/hls.js/blob/deployments/README.
<video id="video"></video>
<script>
var video = document.getElementById('video');
if(Hls.isSupported()) {
if (Hls.isSupported()) {
var hls = new Hls();
hls.loadSource('https://video-dev.github.io/streams/x36xhzz/x36xhzz.m3u8');
hls.attachMedia(video);
hls.on(Hls.Events.MANIFEST_PARSED,function() {
hls.on(Hls.Events.MANIFEST_PARSED, function() {
video.play();
});
}
Expand All @@ -78,7 +78,7 @@ Find the commit on [https://github.com/video-dev/hls.js/blob/deployments/README.
// white-list before a 'canplay' event will be emitted; the last video event that can be reliably listened-for when the URL is not on the white-list is 'loadedmetadata'.
else if (video.canPlayType('application/vnd.apple.mpegurl')) {
video.src = 'https://video-dev.github.io/streams/x36xhzz/x36xhzz.m3u8';
video.addEventListener('loadedmetadata',function() {
video.addEventListener('loadedmetadata', function() {
video.play();
});
}
Expand Down

0 comments on commit 43e57ca

Please sign in to comment.