diff options
| author | Andreas Huber <andih@google.com> | 2012-03-23 08:39:04 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2012-03-23 08:39:04 -0700 |
| commit | 6f64c90c84483d108da2d2572e3be44377e6a79e (patch) | |
| tree | 86648b6aab1cb84b3dcc1594e38a3845c5c02970 /media | |
| parent | 2e842a58ebbc3a8a0599dfb0c19d7cda7ed21e5f (diff) | |
| download | frameworks_base-6f64c90c84483d108da2d2572e3be44377e6a79e.zip frameworks_base-6f64c90c84483d108da2d2572e3be44377e6a79e.tar.gz frameworks_base-6f64c90c84483d108da2d2572e3be44377e6a79e.tar.bz2 | |
Fix the file mimetype reported by the mpeg4 extractor.
Change-Id: I72474c17757dba5867f55b0e99e76e9e4e32ce7b
related-to-bug: 6217289
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/MPEG4Extractor.cpp | 3 | ||||
| -rw-r--r-- | media/libstagefright/MediaDefs.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 663f285..9385b8a 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -373,7 +373,8 @@ status_t MPEG4Extractor::readMetaData() { if (mInitCheck == OK) { if (mHasVideo) { - mFileMetaData->setCString(kKeyMIMEType, "video/mp4"); + mFileMetaData->setCString( + kKeyMIMEType, MEDIA_MIMETYPE_CONTAINER_MPEG4); } else { mFileMetaData->setCString(kKeyMIMEType, "audio/mp4"); } diff --git a/media/libstagefright/MediaDefs.cpp b/media/libstagefright/MediaDefs.cpp index 2549de6..2740d6b 100644 --- a/media/libstagefright/MediaDefs.cpp +++ b/media/libstagefright/MediaDefs.cpp @@ -41,7 +41,7 @@ const char *MEDIA_MIMETYPE_AUDIO_RAW = "audio/raw"; const char *MEDIA_MIMETYPE_AUDIO_FLAC = "audio/flac"; const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS = "audio/aac-adts"; -const char *MEDIA_MIMETYPE_CONTAINER_MPEG4 = "video/mpeg4"; +const char *MEDIA_MIMETYPE_CONTAINER_MPEG4 = "video/mp4"; const char *MEDIA_MIMETYPE_CONTAINER_WAV = "audio/wav"; const char *MEDIA_MIMETYPE_CONTAINER_OGG = "application/ogg"; const char *MEDIA_MIMETYPE_CONTAINER_MATROSKA = "video/x-matroska"; |