From 7df8efb4bebb56d237dde25108f2a90106252765 Mon Sep 17 00:00:00 2001
From: Sanj <b@pad.ma>
Date: Sat, 5 Feb 2011 04:55:25 +0530
Subject: [PATCH] json errors

---
 index.html | 51 +++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 45 insertions(+), 6 deletions(-)
diff --git a/index.html b/index.html
index 9a11f01..9ced7ad 100644
--- a/index.html
+++ b/index.html
@@ -1,6 +1,7 @@
 <!doctype html>
 <html>
   <head>
+    <title>&lt;!DOCTYPE html></title>
     <script type="text/javascript" src="jquery.js"></script>
     <script type="text/javascript">
 var currentSlide = 0;
@@ -44,12 +45,42 @@ var allSlides =
     "title": "Give me my Javascript",
     "text": "Full Javascript API to interact with Video object. \n.currentTime to get and set current time-code \nCallbacks functions: onloadedmetadata, onplay, onpause, onended, etc. \nOf course, also behaves like a standard DOM element and responds to onclick, onmouseover, etc."
   },
-
-
+  {
+    "title": "Codec wars",
+    "text": "Ogg Theora: non-patent encumbered, developed by On2 and maintained by the Xiph Foundation, works with Firefox, Chrome, Opera \nH.264: patent-encumbered, license managed by the MPEG-LA consortium, works with IE9 and flash, supports hardware acceleration on certain devices \nWebM: vp8 codec developed by On2, bought and open-sourced by Google last year, works on Chrome, Firefox 4+. Broad support promised, include hardware acceleration support, and support in Flash."
+  },
+  {
+    "title": "So what the hell should you do?",
+    "text": "Option 1: Encode all your video to two separate formats \nOption 2: Use fallbacks / plugins for browsers that don't support the codec you use \nOption 3: Ask browser vendors to support free codecs and don't support their browser until they do \nI have absolutely no clue"
+  },
+  {
+    "title": "Related Standards",
+    "text": "Timed-Text \nMedia Fragment URIs"
+  },
+  {
+    "title": "Timed-text tracks to video",
+    "text": "The need for a standard for caption / subtitle / annotation tracks \nHelping with search \nHelping with accessibility \nFormat wars once again - TTML, SRT, and finally WebVTT \nUsage: the &lt;track /> element"
+  },
+  {
+    "title": "WebVTT: A work in progress",
+    "iframe": "http://www.whatwg.org/specs/web-apps/current-work/webvtt.html"
+  },
+  {
+    "title": "Media Fragment URIs",
+    "text": "Ability to send someone a link to either a temporal or spatial segment within a video \nStandardized format for URLs \nNo clear idea of spatial URIs or how browsers should render them \nStandard for temporal URIs close to finalized \nhttp://coolvideosite.com/video.ogg#t=10:00 \nURL is processed by the browser and seeking is done client-side via HTTP Range requests."
+  },
+  {
+    "title": "The Media Fragments Working Group",
+    "iframe": "http://www.w3.org/2008/WebVideo/Fragments/"
+  },
+  {
+    "title": "Shameless Plugging",
+    "text": "Pad.ma and pan.do/ra"
+  },
 
   {
     "title": "Pad.ma: Public Access Digital Media Archive",
-    "text": "is a text annotated video archive \nBegun in early 2008\n Collaboration between various groups in India and 0x2620.org from Berlin \nVideo material is released under the PGPL (Padma General Public License) \nCode is all released under the GPL :)"
+    "text": "is a text annotated video archive \nBegun in early 2008\n Collaboration between various non-profit groups in India and 0x2620.org from Berlin \nVideo material is released under the PGPL (Padma General Public License) \nCode is all released under the GPL :)"
   },
   {
     "title": "Software Features",
@@ -64,16 +95,24 @@ var allSlides =
     "iframe": 'http://pad.ma'
   },
   {
-    "title": "Future Development: pan.do/ra"
+    "title": "Future Development: pan.do/ra",
     "text": "Building a configurable frame-work for online video archives \nSome new ideas \nJSON architecture \n Software libraries - OxJS, python-ox" 
   },
   {
     "title": "http://dev.pan.do",
-    "iframe": "http://dev.pan.do"
+    "iframe": "Pan.do/ra in development.."
   },
   {
     "title": "We hope someday, you'll join us.. http://wiki.0x2620.org",
-    "iframe": http://wiki.0x2620.org/pandora
+    "iframe": "http://wiki.0x2620.org/wiki/pandora"
+  },
+  {
+    "title": "checkout self - http://code.camputer.org/doctypehtml",
+    "iframe": "http://code.camputer.org/doctypehtml"
+  },
+  {
+    "title": "Thanks!",
+    "text": "Questions?"
   }
 ]
 
