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 | 8d91237333c60c4a6839358109265e8847df23f3 (patch) | |
| tree | 85f6a3b1c12b1b5785d8889923e72e10f9b71746 /include | |
| parent | ecc0840163093942f3418aa4b27e9279c187b173 (diff) | |
| parent | 386d609dc513e838c7e7c4c46c604493ccd560be (diff) | |
| download | frameworks_av-8d91237333c60c4a6839358109265e8847df23f3.zip frameworks_av-8d91237333c60c4a6839358109265e8847df23f3.tar.gz frameworks_av-8d91237333c60c4a6839358109265e8847df23f3.tar.bz2 | |
Merge "Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts streams."
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 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; |