diff options
| author | Andreas Huber <andih@google.com> | 2011-03-30 13:48:10 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-30 13:48:10 -0700 |
| commit | 790ac975d2dec3340f2e564b7ed356a1ec4a6412 (patch) | |
| tree | c4e78d22ea8b1c32554b9138a887f8a54725a0cb /include | |
| parent | 531750912928508418099806c059c761066032ff (diff) | |
| parent | cabb7da7125a80c55233bd23959327424e9646cc (diff) | |
| download | frameworks_base-790ac975d2dec3340f2e564b7ed356a1ec4a6412.zip frameworks_base-790ac975d2dec3340f2e564b7ed356a1ec4a6412.tar.gz frameworks_base-790ac975d2dec3340f2e564b7ed356a1ec4a6412.tar.bz2 | |
Merge "Support for divx files, i.e. mpeg 4 video + mpeg audio layer III in .avi files"
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MediaDefs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/stagefright/MediaDefs.h b/include/media/stagefright/MediaDefs.h index 66dfff6..6a21627 100644 --- a/include/media/stagefright/MediaDefs.h +++ b/include/media/stagefright/MediaDefs.h @@ -45,6 +45,7 @@ extern const char *MEDIA_MIMETYPE_CONTAINER_WAV; 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_AVI; extern const char *MEDIA_MIMETYPE_CONTAINER_WVM; |