summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andreas Huber <andih@google.com> 2011-07-14 09:09:14 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2011-07-14 09:09:14 -0700
commitb39c07b14404eb8ab91fdbfa4560e503ab6cbe8d (patch)
treeb76a1eb8851984ad5e61c2de99bf7ddd861b67ae
parent1a541075622c5eacbef43c1134f7f9a2598b29b7 (diff)
parent8d3073c5c4bfd8b2976d7793e127e686dd306200 (diff)
Merge "Include all supported mime types when querying decoder profile/level support."
-rw-r--r--cmds/stagefright/stagefright.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/cmds/stagefright/stagefright.cpp b/cmds/stagefright/stagefright.cpp
index 1a5b7f3ab8b1..dd1c27520218 100644
--- a/cmds/stagefright/stagefright.cpp
+++ b/cmds/stagefright/stagefright.cpp
@@ -793,7 +793,9 @@ int main(int argc, char **argv) {
MEDIA_MIMETYPE_VIDEO_AVC, MEDIA_MIMETYPE_VIDEO_MPEG4,
MEDIA_MIMETYPE_VIDEO_H263, MEDIA_MIMETYPE_AUDIO_AAC,
MEDIA_MIMETYPE_AUDIO_AMR_NB, MEDIA_MIMETYPE_AUDIO_AMR_WB,
- MEDIA_MIMETYPE_AUDIO_MPEG
+ MEDIA_MIMETYPE_AUDIO_MPEG, MEDIA_MIMETYPE_AUDIO_G711_MLAW,
+ MEDIA_MIMETYPE_AUDIO_G711_ALAW, MEDIA_MIMETYPE_AUDIO_VORBIS,
+ MEDIA_MIMETYPE_VIDEO_VPX
};
for (size_t k = 0; k < sizeof(kMimeTypes) / sizeof(kMimeTypes[0]);