aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaZderMind2014-12-02 23:46:17 +0100
committerMaZderMind2014-12-02 23:46:17 +0100
commit31b7f9a73d3cefec2bfbc92ad810eb10b0923757 (patch)
treefa1a1c4f58c160e40b5b570b6f2315283d3e37dc
parent2335b957c32de0adbed6868ea03417597b0b1d33 (diff)
default hls to auto-bitrate
Diffstat (limited to '')
-rw-r--r--pages/room.php1
-rw-r--r--template/assemblies/player/video.phtml2
2 files changed, 2 insertions, 1 deletions
diff --git a/pages/room.php b/pages/room.php
index 96b8f18..64ca86e 100644
--- a/pages/room.php
+++ b/pages/room.php
@@ -47,6 +47,7 @@ echo $tpl->render(array(
'language' => $language,
'translated' => ($language == 'translated'),
'format' => $format,
+ 'hlsformat' => ($format == 'sd' ? 'auto' : $format),
// miniroom = no translation, no slides, no irc, no program
// -> sendezentrum, workshops
diff --git a/template/assemblies/player/video.phtml b/template/assemblies/player/video.phtml
index 169c81d..4d4f48e 100644
--- a/template/assemblies/player/video.phtml
+++ b/template/assemblies/player/video.phtml
@@ -22,7 +22,7 @@
/>
<source
data-plugin-type="native"
- src="<?=h(link_stream('hls', $room, $format, $translated))?>"
+ src="<?=h(link_stream('hls', $room, $hlsformat, $translated))?>"
title="h.264 (HLS)"
type="application/vnd.apple.mpegURL"
/>