diff options
| author | Gloria Wang <gwang@google.com> | 2010-11-05 17:45:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-05 17:45:26 +0000 |
| commit | 91460d7f49e92e13e2acccdf8be10934e9e770fe (patch) | |
| tree | e549aff4d8cda5d1d42fc980a992ac22c0d565d8 /include | |
| parent | aac9e0df287bac2fa15394edf25a6d121aba9886 (diff) | |
| parent | c2c22e7e20a3b10c180c2fed2bf24aedef8ed269 (diff) | |
| download | frameworks_base-91460d7f49e92e13e2acccdf8be10934e9e770fe.zip frameworks_base-91460d7f49e92e13e2acccdf8be10934e9e770fe.tar.gz frameworks_base-91460d7f49e92e13e2acccdf8be10934e9e770fe.tar.bz2 | |
Merge "Add support for WV DRM"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MediaDefs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/media/stagefright/MediaDefs.h b/include/media/stagefright/MediaDefs.h index 92ce068..2d50ca5 100644 --- a/include/media/stagefright/MediaDefs.h +++ b/include/media/stagefright/MediaDefs.h @@ -44,6 +44,8 @@ extern const char *MEDIA_MIMETYPE_CONTAINER_OGG; extern const char *MEDIA_MIMETYPE_CONTAINER_MATROSKA; extern const char *MEDIA_MIMETYPE_CONTAINER_MPEG2TS; +extern const char *MEDIA_MIMETYPE_CONTAINER_WVM; + } // namespace android #endif // MEDIA_DEFS_H_ |