summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/MediaDefs.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-03-24 14:18:02 -0700
committerAndreas Huber <andih@google.com>2011-03-30 13:13:25 -0700
commitf8374dec590223ebdd6959b26d9ba90749dd8328 (patch)
tree4d93c723dcba33bbad56b3f55a664c6a3144481c /media/libstagefright/MediaDefs.cpp
parent72bbbff2dfb120ed1ebc9a50e8509364508bfa70 (diff)
downloadframeworks_av-f8374dec590223ebdd6959b26d9ba90749dd8328.zip
frameworks_av-f8374dec590223ebdd6959b26d9ba90749dd8328.tar.gz
frameworks_av-f8374dec590223ebdd6959b26d9ba90749dd8328.tar.bz2
Support for divx files, i.e. mpeg 4 video + mpeg audio layer III in .avi files
Change-Id: I6e1e989c43300ddb0d341e3e9183cdccd69eeae6 related-to-bug: 4192562
Diffstat (limited to 'media/libstagefright/MediaDefs.cpp')
-rw-r--r--media/libstagefright/MediaDefs.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libstagefright/MediaDefs.cpp b/media/libstagefright/MediaDefs.cpp
index 0be7261..8ca6ee8 100644
--- a/media/libstagefright/MediaDefs.cpp
+++ b/media/libstagefright/MediaDefs.cpp
@@ -43,6 +43,7 @@ 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";
const char *MEDIA_MIMETYPE_CONTAINER_MPEG2TS = "video/mp2ts";
+const char *MEDIA_MIMETYPE_CONTAINER_AVI = "video/avi";
const char *MEDIA_MIMETYPE_CONTAINER_WVM = "video/wvm";