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/MediaDefs.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/MediaDefs.cpp')
| -rw-r--r-- | media/libstagefright/MediaDefs.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libstagefright/MediaDefs.cpp b/media/libstagefright/MediaDefs.cpp index 4b3813b..327a0ce 100644 --- a/media/libstagefright/MediaDefs.cpp +++ b/media/libstagefright/MediaDefs.cpp @@ -20,6 +20,7 @@ namespace android { const char *MEDIA_MIMETYPE_IMAGE_JPEG = "image/jpeg"; +const char *MEDIA_MIMETYPE_VIDEO_VPX = "video/x-vnd.on2.vp8"; const char *MEDIA_MIMETYPE_VIDEO_AVC = "video/avc"; const char *MEDIA_MIMETYPE_VIDEO_MPEG4 = "video/mp4v-es"; const char *MEDIA_MIMETYPE_VIDEO_H263 = "video/3gpp"; @@ -36,5 +37,6 @@ const char *MEDIA_MIMETYPE_AUDIO_RAW = "audio/raw"; const char *MEDIA_MIMETYPE_CONTAINER_MPEG4 = "video/mpeg4"; const char *MEDIA_MIMETYPE_CONTAINER_WAV = "audio/wav"; const char *MEDIA_MIMETYPE_CONTAINER_OGG = "application/ogg"; +const char *MEDIA_MIMETYPE_CONTAINER_MATROSKA = "video/x-matroska"; } // namespace android |