summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/DataSource.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-05-20 14:56:53 -0700
committerAndreas Huber <andih@google.com>2010-05-20 14:56:53 -0700
commit093437c388e5dff6903a3d43f2ca9f8a1ba4744a (patch)
treee60f6bdcb9589bd8476123a6aff0bb3836daa675 /media/libstagefright/DataSource.cpp
parentcf14f10b7bf39a84205333b87d5c5b7db9598de3 (diff)
downloadframeworks_av-093437c388e5dff6903a3d43f2ca9f8a1ba4744a.zip
frameworks_av-093437c388e5dff6903a3d43f2ca9f8a1ba4744a.tar.gz
frameworks_av-093437c388e5dff6903a3d43f2ca9f8a1ba4744a.tar.bz2
Support for media extraction from .mkv/.mka Matroska files in stagefright.
Change-Id: I4c26579828ad575523ccf58b0b5cb144046c04ca related-to-bug: 2483739
Diffstat (limited to 'media/libstagefright/DataSource.cpp')
-rw-r--r--media/libstagefright/DataSource.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libstagefright/DataSource.cpp b/media/libstagefright/DataSource.cpp
index a66f86b..475422d 100644
--- a/media/libstagefright/DataSource.cpp
+++ b/media/libstagefright/DataSource.cpp
@@ -20,6 +20,8 @@
#include "include/WAVExtractor.h"
#include "include/OggExtractor.h"
+#include "matroska/MatroskaExtractor.h"
+
#include <media/stagefright/CachingDataSource.h>
#include <media/stagefright/DataSource.h>
#include <media/stagefright/FileSource.h>
@@ -94,6 +96,7 @@ void DataSource::RegisterDefaultSniffers() {
RegisterSniffer(SniffAMR);
RegisterSniffer(SniffWAV);
RegisterSniffer(SniffOgg);
+ RegisterSniffer(SniffMatroska);
}
// static