diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-02-12 22:30:27 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-02-12 22:30:27 -0800 |
| commit | 001a7b82e04646682170d4b946529ebc0b956c16 (patch) | |
| tree | fb3784437f93380f21b6d69e9c819fc1305104da /media/libstagefright/id3 | |
| parent | d852697190e617c43930723bbb446375394b4194 (diff) | |
| parent | f0ff908da019a44115109f1b4d1b6864b35a8a29 (diff) | |
| download | frameworks_av-001a7b82e04646682170d4b946529ebc0b956c16.zip frameworks_av-001a7b82e04646682170d4b946529ebc0b956c16.tar.gz frameworks_av-001a7b82e04646682170d4b946529ebc0b956c16.tar.bz2 | |
Merge tag 'android-4.2.2_r1' of https://android.googlesource.com/platform/frameworks/av into 1.1
Android 4.2.2 release 1
Diffstat (limited to 'media/libstagefright/id3')
| -rw-r--r-- | media/libstagefright/id3/ID3.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/id3/ID3.cpp b/media/libstagefright/id3/ID3.cpp index 69274ca..22c2f5a 100644 --- a/media/libstagefright/id3/ID3.cpp +++ b/media/libstagefright/id3/ID3.cpp @@ -30,7 +30,7 @@ namespace android { static const size_t kMaxMetadataSize = 3 * 1024 * 1024; -ID3::ID3(const sp<DataSource> &source) +ID3::ID3(const sp<DataSource> &source, bool ignoreV1) : mIsValid(false), mData(NULL), mSize(0), @@ -38,7 +38,7 @@ ID3::ID3(const sp<DataSource> &source) mVersion(ID3_UNKNOWN) { mIsValid = parseV2(source); - if (!mIsValid) { + if (!mIsValid && !ignoreV1) { mIsValid = parseV1(source); } } |