From ae466cc59ba2233f74a7c4b4ef4380a598eaa5a0 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Fri, 5 Jun 2015 18:45:45 +0100
Subject: [PATCH] Allow fmp4 in demo app (demuxed only)

---
 .../com/google/android/exoplayer/demo/PlayerActivity.java     | 4 ++++
 1 file changed, 4 insertions(+)

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 a47d082e0a..aaf85ab1ba 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
@@ -27,6 +27,7 @@ import com.google.android.exoplayer.demo.player.HlsRendererBuilder;
 import com.google.android.exoplayer.demo.player.SmoothStreamingRendererBuilder;
 import com.google.android.exoplayer.drm.UnsupportedDrmException;
 import com.google.android.exoplayer.extractor.mp3.Mp3Extractor;
+import com.google.android.exoplayer.extractor.mp4.FragmentedMp4Extractor;
 import com.google.android.exoplayer.extractor.mp4.Mp4Extractor;
 import com.google.android.exoplayer.extractor.ts.AdtsExtractor;
 import com.google.android.exoplayer.extractor.ts.TsExtractor;
@@ -262,6 +263,9 @@ public class PlayerActivity extends Activity implements SurfaceHolder.Callback,
             new TsExtractor(0, audioCapabilities));
       case TYPE_AAC:
         return new ExtractorRendererBuilder(this, userAgent, contentUri, new AdtsExtractor());
+      case TYPE_FMP4:
+        return new ExtractorRendererBuilder(this, userAgent, contentUri,
+            new FragmentedMp4Extractor());
       case TYPE_WEBM:
         return new ExtractorRendererBuilder(this, userAgent, contentUri, new WebmExtractor());
       default: