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 | 6eb50f7ad52687331e55400a161164a62b8ebd52 (patch) | |
tree | 18a2f828bb2b20997af83c541402a553ae2c763c /media/libstagefright/include | |
parent | a6c87d18d0edf49ee5fa7c979f9d41b2febe4062 (diff) | |
parent | 45be8448daafeab8f37cb82cd2219f95bc218a6a (diff) | |
download | frameworks_av-6eb50f7ad52687331e55400a161164a62b8ebd52.zip frameworks_av-6eb50f7ad52687331e55400a161164a62b8ebd52.tar.gz frameworks_av-6eb50f7ad52687331e55400a161164a62b8ebd52.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; |