diff options
| author | Andreas Huber <andih@google.com> | 2010-05-20 14:56:53 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-05-20 14:56:53 -0700 |
| commit | 093437c388e5dff6903a3d43f2ca9f8a1ba4744a (patch) | |
| tree | e60f6bdcb9589bd8476123a6aff0bb3836daa675 /media/libstagefright/MediaExtractor.cpp | |
| parent | cf14f10b7bf39a84205333b87d5c5b7db9598de3 (diff) | |
| download | frameworks_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/MediaExtractor.cpp')
| -rw-r--r-- | media/libstagefright/MediaExtractor.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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; |