diff options
| author | MaZderMind | 2016-12-27 09:19:10 +0100 |
|---|---|---|
| committer | MaZderMind | 2016-12-27 09:19:10 +0100 |
| commit | f5e7bc37a2b75442a6e6c04c9efcd145dc754198 (patch) | |
| tree | 2d419537d96217377b3d53e760d5a698ab78ad62 /configs/conferences | |
| parent | 036232518a804c7c6ea3f25b050209e30dd12735 (diff) | |
| parent | 4f9d6c1ac4ac924b28f82e0ed177b42fd7c25a61 (diff) | |
Merge branch 'events/33c3' of ssh://mng.ber.c3voc.de/streaming-website into events/33c3
Diffstat (limited to 'configs/conferences')
| -rw-r--r-- | configs/conferences/33c3/config.php | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/configs/conferences/33c3/config.php b/configs/conferences/33c3/config.php index 48298d8..f4f5285 100644 --- a/configs/conferences/33c3/config.php +++ b/configs/conferences/33c3/config.php @@ -207,7 +207,7 @@ $CONFIG['ROOMS'] = array( * als Default-Stream angenommen. */ 'HD_VIDEO' => true, - 'DASH' => true, + 'DASH' => false, /** * Slide-Only-Stream (1024×576) verfügbar @@ -218,7 +218,7 @@ $CONFIG['ROOMS'] = array( * In diesem Fall wird, sofern jeweils aktiviert, Audio und zuletzt Musik als * Default-Stream angenommen. */ - 'SLIDES' => true, + 'SLIDES' => false, /** * Audio-Only-Stream verfügbar @@ -369,9 +369,9 @@ $CONFIG['ROOMS'] = array( 'TRANSLATION' => true, 'SD_VIDEO' => true, 'HD_VIDEO' => true, - 'DASH' => true, + 'DASH' => false, 'AUDIO' => true, - 'SLIDES' => true, + 'SLIDES' => false, 'MUSIC' => false, 'SCHEDULE' => true, @@ -400,9 +400,9 @@ $CONFIG['ROOMS'] = array( 'TRANSLATION' => true, 'SD_VIDEO' => true, 'HD_VIDEO' => true, - 'DASH' => true, + 'DASH' => false, 'AUDIO' => true, - 'SLIDES' => true, + 'SLIDES' => false, 'MUSIC' => false, 'SCHEDULE' => true, @@ -430,9 +430,9 @@ $CONFIG['ROOMS'] = array( 'TRANSLATION' => true, 'SD_VIDEO' => true, 'HD_VIDEO' => true, - 'DASH' => true, + 'DASH' => false, 'AUDIO' => true, - 'SLIDES' => true, + 'SLIDES' => false, 'MUSIC' => false, 'SCHEDULE' => true, @@ -475,7 +475,7 @@ $CONFIG['ROOMS'] = array( 'SD_VIDEO' => true, 'HD_VIDEO' => true, - 'DASH' => true, + 'DASH' => false, 'AUDIO' => true, 'SCHEDULE' => true, |