diff options
| author | Marco Nelissen <marcone@google.com> | 2012-11-29 11:35:12 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-29 11:35:12 -0800 |
| commit | c67d057596d81aea8fcd4868453cfcb501157297 (patch) | |
| tree | 025085be6fcc4ead1be6f033b114d5f8f3f2dde9 /media/libstagefright/include | |
| parent | 504dd3fdad2e1f59eb553ea2d4f94235eb7a8472 (diff) | |
| parent | ce8dcdf5361dd5de8c86cf5b0308c71d519f98ca (diff) | |
| download | frameworks_av-c67d057596d81aea8fcd4868453cfcb501157297.zip frameworks_av-c67d057596d81aea8fcd4868453cfcb501157297.tar.gz frameworks_av-c67d057596d81aea8fcd4868453cfcb501157297.tar.bz2 | |
am ce8dcdf5: am 031c93df: Merge "Bug fix for the MediaPlayer::prepare() api."
* commit 'ce8dcdf5361dd5de8c86cf5b0308c71d519f98ca':
Bug fix for the MediaPlayer::prepare() api.
Diffstat (limited to 'media/libstagefright/include')
| -rw-r--r-- | media/libstagefright/include/ID3.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/include/ID3.h b/media/libstagefright/include/ID3.h index 8714008..3028f56 100644 --- a/media/libstagefright/include/ID3.h +++ b/media/libstagefright/include/ID3.h @@ -35,7 +35,7 @@ struct ID3 { ID3_V2_4, }; - ID3(const sp<DataSource> &source); + ID3(const sp<DataSource> &source, bool ignoreV1 = false); ~ID3(); bool isValid() const; |