diff options
| author | Marco Nelissen <marcone@google.com> | 2013-08-19 13:07:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-19 13:07:07 -0700 |
| commit | 5eab65aa7bd40e907d11dca8aad69714ffef19f1 (patch) | |
| tree | c2e116316b06b0ae400d4659bfd11f920ad71cdb /media/libstagefright/include | |
| parent | a8542f05253e31a64428baf93a31183988a065bb (diff) | |
| parent | ff58698ec7e0f32bf9f3e1758173fe170e17270c (diff) | |
| download | frameworks_av-5eab65aa7bd40e907d11dca8aad69714ffef19f1.zip frameworks_av-5eab65aa7bd40e907d11dca8aad69714ffef19f1.tar.gz frameworks_av-5eab65aa7bd40e907d11dca8aad69714ffef19f1.tar.bz2 | |
am ff58698e: am f36ae7ca: Merge "Added support for 3GPP meta data atoms"
* commit 'ff58698ec7e0f32bf9f3e1758173fe170e17270c':
Added support for 3GPP meta data atoms
Diffstat (limited to 'media/libstagefright/include')
| -rw-r--r-- | media/libstagefright/include/MPEG4Extractor.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/include/MPEG4Extractor.h b/media/libstagefright/include/MPEG4Extractor.h index bbec1c4..bd5e4b9 100644 --- a/media/libstagefright/include/MPEG4Extractor.h +++ b/media/libstagefright/include/MPEG4Extractor.h @@ -95,7 +95,8 @@ private: status_t readMetaData(); status_t parseChunk(off64_t *offset, int depth); - status_t parseMetaData(off64_t offset, size_t size); + status_t parseITunesMetaData(off64_t offset, size_t size); + status_t parse3GPPMetaData(off64_t offset, size_t size, int depth); status_t updateAudioTrackInfoFromESDS_MPEG4Audio( const void *esds_data, size_t esds_size); |