diff options
| author | Andreas Huber <andih@google.com> | 2010-04-12 17:21:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-12 17:21:33 -0700 |
| commit | 7853c8988fe30d1a150dcf62887506f36ea75242 (patch) | |
| tree | 5a8e9d8e028613a0dcbe08647a028a5f4e4a8fa6 /include | |
| parent | 5c7a69c3d6f41f60f4bfc3f7e3123941d382f3a7 (diff) | |
| parent | 248ea4a9f773210a7b7dbd7892e6b865a0f7add3 (diff) | |
| download | frameworks_base-7853c8988fe30d1a150dcf62887506f36ea75242.zip frameworks_base-7853c8988fe30d1a150dcf62887506f36ea75242.tar.gz frameworks_base-7853c8988fe30d1a150dcf62887506f36ea75242.tar.bz2 | |
am 248ea4a9: am 5baa5e19: Merge "Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don\'t have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks." into froyo
Merge commit '248ea4a9f773210a7b7dbd7892e6b865a0f7add3' into kraken
* commit '248ea4a9f773210a7b7dbd7892e6b865a0f7add3':
Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don't have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks.
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 1efeb92..3f8bc51 100644 --- a/include/media/stagefright/MediaDefs.h +++ b/include/media/stagefright/MediaDefs.h @@ -31,6 +31,7 @@ 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_AAC; +extern const char *MEDIA_MIMETYPE_AUDIO_QCELP; extern const char *MEDIA_MIMETYPE_AUDIO_RAW; extern const char *MEDIA_MIMETYPE_CONTAINER_MPEG4; |