diff options
| author | Marco Nelissen <marcone@google.com> | 2013-11-25 16:34:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-11-25 16:34:07 +0000 |
| commit | 11e715589e0f3f96389d0eedab677369da680fd4 (patch) | |
| tree | 68c48154a0a3c8d46f04f4ac3f6334b49b24e8e1 /media | |
| parent | 5bf2560ce9b70bee077e0c264ac06648f0f63acc (diff) | |
| parent | f7df9ab3187a3c02bffe1fba10d3fb95197e4a07 (diff) | |
| download | frameworks_av-11e715589e0f3f96389d0eedab677369da680fd4.zip frameworks_av-11e715589e0f3f96389d0eedab677369da680fd4.tar.gz frameworks_av-11e715589e0f3f96389d0eedab677369da680fd4.tar.bz2 | |
Merge "Fixed data offset at parsing IPMP Descriptors"
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/MPEG4Extractor.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index cbc169b..d0b6185 100644 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -682,8 +682,9 @@ status_t MPEG4Extractor::parseDrmSINF(off64_t *offset, off64_t data_offset) { } sinf->len = dataLen - 3; sinf->IPMPData = new char[sinf->len]; + data_offset += 2; - if (mDataSource->readAt(data_offset + 2, sinf->IPMPData, sinf->len) < sinf->len) { + if (mDataSource->readAt(data_offset, sinf->IPMPData, sinf->len) < sinf->len) { return ERROR_IO; } data_offset += sinf->len; |