From 093437c388e5dff6903a3d43f2ca9f8a1ba4744a Mon Sep 17 00:00:00 2001
From: Andreas Huber <andih@google.com>
Date: Thu, 20 May 2010 14:56:53 -0700
Subject: Support for media extraction from .mkv/.mka Matroska files in
 stagefright.

Change-Id: I4c26579828ad575523ccf58b0b5cb144046c04ca
related-to-bug: 2483739
---
 media/libstagefright/MediaExtractor.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'media/libstagefright/MediaExtractor.cpp')

diff --git a/media/libstagefright/MediaExtractor.cpp b/media/libstagefright/MediaExtractor.cpp
index 513f49c..376d715 100644
--- a/media/libstagefright/MediaExtractor.cpp
+++ b/media/libstagefright/MediaExtractor.cpp
@@ -24,6 +24,8 @@
 #include "include/WAVExtractor.h"
 #include "include/OggExtractor.h"
 
+#include "matroska/MatroskaExtractor.h"
+
 #include <media/stagefright/DataSource.h>
 #include <media/stagefright/MediaDefs.h>
 #include <media/stagefright/MediaExtractor.h>
@@ -69,6 +71,8 @@ sp<MediaExtractor> MediaExtractor::Create(
         return new WAVExtractor(source);
     } else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_OGG)) {
         return new OggExtractor(source);
+    } else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_MATROSKA)) {
+        return new MatroskaExtractor(source);
     }
 
     return NULL;
-- 
cgit v1.1