Skip to content

Commit

Permalink
Re-enable HLS on Android to maintain support for main plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
Angie Israni committed Apr 21, 2016
1 parent 38a9a65 commit 798fc98
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions src/main/js/main_html5.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,10 @@ require("../../../html5-common/js/utils/environment.js");

if ((!!videoElement.canPlayType("application/vnd.apple.mpegurl") ||
!!videoElement.canPlayType("application/x-mpegURL")) &&
!OO.isSmartTV && !OO.isRimDevice && !OO.isAndroid &&
!OO.isSmartTV && !OO.isRimDevice &&
(!OO.isMacOs || OO.isMacOsLionOrLater)) {
// 2012 models of Samsung and LG smart TV's do not support HLS even if reported
// Mac OS must be lion or later
// We do not yet officially support HLS on android chrome; blocking it until it's ready
list.push(OO.VIDEO.ENCODING.HLS);
}

Expand Down

0 comments on commit 798fc98

Please sign in to comment.