Merge branch 'master' of vcs.fsf.org:libreplanet-static
[libreplanet-static.git] / 2017 / live / index.html
index edceea1f34b7f6836df1610bcb0fcd1d0b4e701b..49e5d54a56f7bd8d0074cad6b03db01181a0a302 100755 (executable)
       <p>
         Our conference streaming web interface requires JavaScript, but
         all of our streams are readily available on
-        <a href="http://live2.fsf.org">
-          live2.fsf.org
+        <a href="http://live.fsf.org">
+          live.fsf.org
         </a>
         and can be played with the video client of your
         choice, such as VLC or mplayer.
       </p>
       <p>
        You can watch the streams directly by using vlc or some other media players with the following URLs:<br><br>
-       https://live2.fsf.org/stream-123.webm <br>
-       https://live2.fsf.org/stream-141.webm <br>
-       https://live2.fsf.org/stream-144.webm <br>
-       https://live2.fsf.org/stream-155.webm <br><br>
-       https://live2.fsf.org/slides-123.webm <br>
-       https://live2.fsf.org/slides-141.webm <br>
-       https://live2.fsf.org/slides-144.webm <br>
-       https://live2.fsf.org/slides-155.webm <br><br>
+
+       https://live.fsf.org/stream-123.webm <br>
+       https://live.fsf.org/stream-141.webm <br>
+       https://live.fsf.org/stream-144.webm <br>
+       https://live.fsf.org/stream-155.webm <br><br>
+
+       https://live.fsf.org/slides-123.webm <br>
+       https://live.fsf.org/slides-141.webm <br>
+       https://live.fsf.org/slides-144.webm <br>
+       https://live.fsf.org/slides-155.webm <br><br>
+
+       https://live.fsf.org/stream-123-480p.webm <br>
+       https://live.fsf.org/stream-141-480p.webm <br>
+       https://live.fsf.org/stream-144-480p.webm <br>
+       https://live.fsf.org/stream-155-480p.webm <br><br>
+
        or using something like this on a terminal:
 <pre>
-vlc https://live2.fsf.org/stream-123.webm
-mpv https://live2.fsf.org/stream-141.webm
-ffplay https://live2.fsf.org/stream-155.webm
+vlc https://live.fsf.org/stream-123.webm
+mpv https://live.fsf.org/stream-141.webm
+ffplay https://live.fsf.org/stream-155.webm
 </pre>
       </p>
     </noscript>