diff options
| author | MaZderMind | 2014-12-27 16:19:13 +0100 |
|---|---|---|
| committer | MaZderMind | 2014-12-27 16:19:13 +0100 |
| commit | ab0a2cfbf2b4be1d87376052a02ef2e67557bf0b (patch) | |
| tree | 2e0d0ac51cfc44aac6483669d009c29ca29c96ff /template/assemblies/player | |
| parent | 696066a2df58fa12bfbdac427a767efdb4fe00a4 (diff) | |
| parent | 03d3f65e9cdc7100628fb8dde20f97f503e09c57 (diff) | |
Merge branch 'master' into relivew
Conflicts:
31c3/assets/css/lustige-styles.css.map
Diffstat (limited to 'template/assemblies/player')
| -rw-r--r-- | template/assemblies/player/video.phtml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/template/assemblies/player/video.phtml b/template/assemblies/player/video.phtml index b6036a5..0955492 100644 --- a/template/assemblies/player/video.phtml +++ b/template/assemblies/player/video.phtml @@ -7,12 +7,14 @@ style="width: 100%; height: 100%;" class="<?=h($miniroom ? 'nosubs' : 'subs')?>" > + <? if(!$translated): ?> <source data-plugin-type="native" src="<?=h(link_stream('webm', $room, $format, $translated))?>" title="WebM (Icecast)" type="video/webm" /> + <? endif ?> <source data-plugin-type="flash" src="<?=h(link_stream('rtmp', $room, $format, $translated))?>" |