Skip to content

Commit

Permalink
Merge branch 'refs/heads/development'
Browse files Browse the repository at this point in the history
  • Loading branch information
Dan Sparacio committed Feb 12, 2016
2 parents 3f1c80c + 7fbc100 commit f8a1e50
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions samples/dash-if-reference-player/app/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -575,8 +575,8 @@ app.controller('DashController', function($scope, Sources, Notes, Contributors,
player.attachVideoContainer(document.getElementById("videoContainer"));

// Add HTML-rendered TTML subtitles
ttmlDiv = document.querySelector("#video-caption");
player.attachTTMLRenderingDiv(ttmlDiv);
//ttmlDiv = document.querySelector("#video-caption");
//player.attachTTMLRenderingDiv(ttmlDiv);

player.setAutoPlay(true);
controlbar = new ControlBar(player);
Expand Down

0 comments on commit f8a1e50

Please sign in to comment.