diff options
| author | Andreas Huber <andih@google.com> | 2011-05-26 08:52:55 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-26 08:52:55 -0700 |
| commit | 73a4b2b3be14255f87c4108d4e414b9137da6510 (patch) | |
| tree | abcbd4946c4d9c45cea1144f493b06fb5cc7864e /include/media | |
| parent | 31beb6db09174da843a4af243842c0d265f02402 (diff) | |
| parent | eb2f9c193d74c005a0c78e6dbed874809d55fc81 (diff) | |
| download | frameworks_base-73a4b2b3be14255f87c4108d4e414b9137da6510.zip frameworks_base-73a4b2b3be14255f87c4108d4e414b9137da6510.tar.gz frameworks_base-73a4b2b3be14255f87c4108d4e414b9137da6510.tar.bz2 | |
Merge "Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts streams."
Diffstat (limited to 'include/media')
| -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 5e471c1..3e48459 100644 --- a/include/media/stagefright/MediaDefs.h +++ b/include/media/stagefright/MediaDefs.h @@ -26,6 +26,7 @@ extern const char *MEDIA_MIMETYPE_VIDEO_VPX; extern const char *MEDIA_MIMETYPE_VIDEO_AVC; extern const char *MEDIA_MIMETYPE_VIDEO_MPEG4; extern const char *MEDIA_MIMETYPE_VIDEO_H263; +extern const char *MEDIA_MIMETYPE_VIDEO_MPEG2; extern const char *MEDIA_MIMETYPE_VIDEO_RAW; extern const char *MEDIA_MIMETYPE_AUDIO_AMR_NB; |