X-Git-Url: http://pere.pagekite.me/gitweb/homepage.git/blobdiff_plain/1ad5cb0889829354f52ee39c19b13c6e21708e1c..f7011b7709b9d81451d826504f4408706c500063:/blog/data/2015-02-25-frikanalen-uninett.txt

diff --git a/blog/data/2015-02-25-frikanalen-uninett.txt b/blog/data/2015-02-25-frikanalen-uninett.txt
index 92a1286435..b13fc8fb0e 100644
--- a/blog/data/2015-02-25-frikanalen-uninett.txt
+++ b/blog/data/2015-02-25-frikanalen-uninett.txt
@@ -1,5 +1,5 @@
 Title: The Norwegian open channel Frikanalen - 24x7 on the Internet
-Tags: english, video, nuug, frikanalen
+Tags: english, video, nuug, frikanalen, h264
 Date: 2015-02-25 09:10
 
 <p>The Norwegian nationwide open channel
@@ -7,13 +7,13 @@ Date: 2015-02-25 09:10
 strong.  It allow everyone to send the video they want on national
 television.  It is a TV station administrated completely using a web
 browser, running only <ahref="https://github.com/Frikanalen">Free
-Software</a>, providing a REST api for administrators and members, and
-with distribution on the national DVB-T distribution network RiksTV.
-But only between 12:00 and 17:30 Norwegian time.  This has finally
-changed, after many years with limited distribution.  A few weeks ago,
-we set up a Ogg Theora stream via icecast to allow everyone with
-Internet access to check out the channel the rest of the day.  This is
-presented on
+Software</a>, providing <ahref="http://beta.frikanalen.tv/api">a REST
+api</a> for administrators and members, and with distribution on the
+national DVB-T distribution network RiksTV.  But only between 12:00
+and 17:30 Norwegian time.  This has finally changed, after many years
+with limited distribution.  A few weeks ago, we set up a Ogg Theora
+stream via icecast to allow everyone with Internet access to check out
+the channel the rest of the day.  This is presented on
 <a href="http://www.frikanalen.tv/se">the Frikanalen web site now</a>.  And
 since a few days ago, the channel is also available
 via <a href="https://www.uninett.no/iptv-tilgang">multicast on