diff --git a/demo/src/main/java/com/google/android/exoplayer/demo/DemoUtil.java b/demo/src/main/java/com/google/android/exoplayer/demo/DemoUtil.java
index 9cedd0090d..880e45df47 100644
--- a/demo/src/main/java/com/google/android/exoplayer/demo/DemoUtil.java
+++ b/demo/src/main/java/com/google/android/exoplayer/demo/DemoUtil.java
@@ -46,9 +46,10 @@ public class DemoUtil {
   public static final int TYPE_HLS = 2;
   public static final int TYPE_MP4 = 3;
   public static final int TYPE_MP3 = 4;
-  public static final int TYPE_TS = 5;
-  public static final int TYPE_AAC = 6;
-  public static final int TYPE_OTHER = 7;
+  public static final int TYPE_WEBM = 5;
+  public static final int TYPE_TS = 6;
+  public static final int TYPE_AAC = 7;
+  public static final int TYPE_OTHER = 8;
 
   private static final CookieManager defaultCookieManager;
 
diff --git a/demo/src/main/java/com/google/android/exoplayer/demo/PlayerActivity.java b/demo/src/main/java/com/google/android/exoplayer/demo/PlayerActivity.java
index 36925efa24..6ca5273865 100644
--- a/demo/src/main/java/com/google/android/exoplayer/demo/PlayerActivity.java
+++ b/demo/src/main/java/com/google/android/exoplayer/demo/PlayerActivity.java
@@ -31,6 +31,7 @@ import com.google.android.exoplayer.extractor.mp3.Mp3Extractor;
 import com.google.android.exoplayer.extractor.mp4.Mp4Extractor;
 import com.google.android.exoplayer.extractor.ts.AdtsExtractor;
 import com.google.android.exoplayer.extractor.ts.TsExtractor;
+import com.google.android.exoplayer.extractor.webm.WebmExtractor;
 import com.google.android.exoplayer.metadata.GeobMetadata;
 import com.google.android.exoplayer.metadata.PrivMetadata;
 import com.google.android.exoplayer.metadata.TxxxMetadata;
@@ -242,6 +243,9 @@ public class PlayerActivity extends Activity implements SurfaceHolder.Callback,
       case DemoUtil.TYPE_AAC:
         return new ExtractorRendererBuilder(userAgent, contentUri, debugTextView,
             new AdtsExtractor());
+      case DemoUtil.TYPE_WEBM:
+        return new ExtractorRendererBuilder(userAgent, contentUri, debugTextView,
+            new WebmExtractor());
       default:
         return new DefaultRendererBuilder(this, contentUri, debugTextView);
     }
diff --git a/demo/src/main/java/com/google/android/exoplayer/demo/Samples.java b/demo/src/main/java/com/google/android/exoplayer/demo/Samples.java
index 420e7ec33c..0368f23a88 100644
--- a/demo/src/main/java/com/google/android/exoplayer/demo/Samples.java
+++ b/demo/src/main/java/com/google/android/exoplayer/demo/Samples.java
@@ -147,6 +147,9 @@ import java.util.Locale;
     new Sample("Google Play (MP3 Audio)",
         "http://storage.googleapis.com/exoplayer-test-media-0/play.mp3",
         DemoUtil.TYPE_MP3),
+    new Sample("Google Glass (WebM Video with Vorbis Audio)",
+        "http://demos.webmproject.org/exoplayer/glass_vp9_vorbis.webm",
+        DemoUtil.TYPE_WEBM),
   };
 
   private Samples() {}