summaryrefslogtreecommitdiffstats
path: root/include/media/stagefright
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2013-06-25 22:07:56 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-06-25 22:07:56 +0000
commit3b6d6b1b95b9aefc4b2c78808ad7c873f1e8f0f5 (patch)
treecff1198ade127c231b63935ef66605614f79b957 /include/media/stagefright
parent01128a03c85521d463f12e751e887ddbd90895d5 (diff)
parent94705aff3c9eef58cbb72ec6fe5d2dcfd9481646 (diff)
downloadframeworks_av-3b6d6b1b95b9aefc4b2c78808ad7c873f1e8f0f5.zip
frameworks_av-3b6d6b1b95b9aefc4b2c78808ad7c873f1e8f0f5.tar.gz
frameworks_av-3b6d6b1b95b9aefc4b2c78808ad7c873f1e8f0f5.tar.bz2
Merge "Adds VP9 decoding support for stagefright."
Diffstat (limited to 'include/media/stagefright')
-rw-r--r--include/media/stagefright/MediaDefs.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/media/stagefright/MediaDefs.h b/include/media/stagefright/MediaDefs.h
index 81de6e4..85693d4 100644
--- a/include/media/stagefright/MediaDefs.h
+++ b/include/media/stagefright/MediaDefs.h
@@ -22,7 +22,8 @@ namespace android {
extern const char *MEDIA_MIMETYPE_IMAGE_JPEG;
-extern const char *MEDIA_MIMETYPE_VIDEO_VPX;
+extern const char *MEDIA_MIMETYPE_VIDEO_VP8;
+extern const char *MEDIA_MIMETYPE_VIDEO_VP9;
extern const char *MEDIA_MIMETYPE_VIDEO_AVC;
extern const char *MEDIA_MIMETYPE_VIDEO_MPEG4;
extern const char *MEDIA_MIMETYPE_VIDEO_H263;