diff options
| author | Andreas Huber <andih@google.com> | 2011-10-13 10:03:26 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-13 10:03:26 -0700 |
| commit | f337772630b0a1b48d7828647d1079ebdc22919d (patch) | |
| tree | 659620c47a7c8d137c304ef3d6e70553149db506 /include/media | |
| parent | 0cc79c66329b9ffa7d7bdfafa5d245a11fd3660d (diff) | |
| parent | 2944eca607304a095ea43ba2b8f0b9de61249f9f (diff) | |
| download | frameworks_av-f337772630b0a1b48d7828647d1079ebdc22919d.zip frameworks_av-f337772630b0a1b48d7828647d1079ebdc22919d.tar.gz frameworks_av-f337772630b0a1b48d7828647d1079ebdc22919d.tar.bz2 | |
Merge "Support for an MPEG2 Program Stream extractor."
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/stagefright/MediaDefs.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/media/stagefright/MediaDefs.h b/include/media/stagefright/MediaDefs.h index 3e48459..2eb259e 100644 --- a/include/media/stagefright/MediaDefs.h +++ b/include/media/stagefright/MediaDefs.h @@ -31,7 +31,9 @@ extern const char *MEDIA_MIMETYPE_VIDEO_RAW; extern const char *MEDIA_MIMETYPE_AUDIO_AMR_NB; extern const char *MEDIA_MIMETYPE_AUDIO_AMR_WB; -extern const char *MEDIA_MIMETYPE_AUDIO_MPEG; +extern const char *MEDIA_MIMETYPE_AUDIO_MPEG; // layer III +extern const char *MEDIA_MIMETYPE_AUDIO_MPEG_LAYER_I; +extern const char *MEDIA_MIMETYPE_AUDIO_MPEG_LAYER_II; extern const char *MEDIA_MIMETYPE_AUDIO_AAC; extern const char *MEDIA_MIMETYPE_AUDIO_QCELP; extern const char *MEDIA_MIMETYPE_AUDIO_VORBIS; @@ -47,6 +49,7 @@ 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_MPEG2PS; extern const char *MEDIA_MIMETYPE_CONTAINER_WVM; |