summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am f106f9e4: am 15e991bd: resolved conflicts for 0b09da7a to lmp-mr1-devWei Jia2015-10-086-0/+25
|\
| * am 15e991bd: resolved conflicts for 0b09da7a to lmp-mr1-devWei Jia2015-10-086-0/+25
| |\
| | * resolved conflicts for 0b09da7a to lmp-mr1-devWei Jia2015-10-086-0/+25
| | |\
| | | * am 04c02eeb: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely c...Wei Jia2015-10-086-3/+28
| | | |\
| | | | * Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateB...Wei Jia2015-10-086-3/+28
| | | | |\
| | | | | * DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.Wei Jia2015-10-076-3/+28
* | | | | | am d4df7559: am 39f64a1e: am 8b713f11: am b75a78db: am fc0e2a87: am 7ed8d1ef:...Wei Jia2015-10-061-2/+19
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 39f64a1e: am 8b713f11: am b75a78db: am fc0e2a87: am 7ed8d1ef: ID3: check p...Wei Jia2015-10-061-2/+19
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 8b713f11: am b75a78db: am fc0e2a87: am 7ed8d1ef: ID3: check possible integ...Wei Jia2015-10-061-2/+19
| | |\ \ \ \ | | | |/ / /
| | | * | | am b75a78db: am fc0e2a87: am 7ed8d1ef: ID3: check possible integer overflow f...Wei Jia2015-10-061-2/+19
| | | |\ \ \ | | | | |/ /
| | | | * | am fc0e2a87: am 7ed8d1ef: ID3: check possible integer overflow for extendedHe...Wei Jia2015-10-061-2/+19
| | | | |\ \ | | | | | |/ | | | | |/|
| | | | | * am 7ed8d1ef: ID3: check possible integer overflow for extendedHeaderSize and ...Wei Jia2015-10-061-2/+19
| | | | | |\
| | | | | | * ID3: check possible integer overflow for extendedHeaderSize and paddingSize.Wei Jia2015-10-061-2/+19
* | | | | | | am 5e92fded: am 64cdd5f2: am f2cf2bd7: am 07395f4c: am 00f5fa82: am 74d1927e:...Marco Nelissen2015-10-061-2/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 64cdd5f2: am f2cf2bd7: am 07395f4c: am 00f5fa82: am 74d1927e: Merge "Check...Marco Nelissen2015-10-061-2/+9
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am f2cf2bd7: am 07395f4c: am 00f5fa82: am 74d1927e: Merge "Check NAL size bef...Marco Nelissen2015-10-061-2/+9
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | am 07395f4c: am 00f5fa82: am 74d1927e: Merge "Check NAL size before use" into...Marco Nelissen2015-10-061-2/+9
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | am 00f5fa82: am 74d1927e: Merge "Check NAL size before use" into klp-devMarco Nelissen2015-10-061-2/+9
| | | | |\ \ \ | | | | | |/ /
| | | | | * | am 74d1927e: Merge "Check NAL size before use" into klp-devMarco Nelissen2015-10-061-2/+9
| | | | | |\ \ | | | | | | |/
| | | | | | * Merge "Check NAL size before use" into klp-devMarco Nelissen2015-10-061-2/+9
| | | | | | |\
| | | | | | | * Check NAL size before useMarco Nelissen2015-10-061-2/+9
* | | | | | | | am 3674abc0: am fb0d63df: am 62d89908: am df68d9d5: am 60b25aa0: am 9ab9c85e:...Wei Jia2015-10-061-0/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am fb0d63df: am 62d89908: am df68d9d5: am 60b25aa0: am 9ab9c85e: Merge "MPEG4...Wei Jia2015-10-061-0/+6
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 62d89908: am df68d9d5: am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: en...Wei Jia2015-10-061-0/+6
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | am df68d9d5: am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer s...Wei Jia2015-10-061-0/+6
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not le...Wei Jia2015-10-061-0/+6
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not less than 8 for...Wei Jia2015-10-061-0/+6
| | | | | |\ \ \ | | | | | | |/ /
| | | | | | * | Merge "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentD...Wei Jia2015-10-061-0/+6
| | | | | | |\ \
| | | | | | | * | MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.Wei Jia2015-10-061-0/+6
| | | | | | | |/
* | | | | | | | am a0c94bc6: am 567ad5c6: am 7ce82583: am 13b6b51e: am f7d1f627: am 257b3bc5:...Marco Nelissen2015-10-061-0/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 567ad5c6: am 7ce82583: am 13b6b51e: am f7d1f627: am 257b3bc5: Don\'t crash...Marco Nelissen2015-10-061-0/+5
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 7ce82583: am 13b6b51e: am f7d1f627: am 257b3bc5: Don\'t crash when there\'...Marco Nelissen2015-10-061-0/+5
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | am 13b6b51e: am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal ...Marco Nelissen2015-10-061-0/+5
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal frameMarco Nelissen2015-10-061-0/+5
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | am 257b3bc5: Don\'t crash when there\'s no conceal frameMarco Nelissen2015-10-061-0/+5
| | | | | |\ \ \ | | | | | | |/ /
| | | | | | * | Don't crash when there's no conceal frameMarco Nelissen2015-10-051-0/+5
| | | | | | |/
* | | | | | | am 4189eb41: am 0e86f9f1: am f888d47c: am 91f5dc8f: am bdaee5ea: (-s ours) am...Flanker2015-09-290-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 0e86f9f1: am f888d47c: am 91f5dc8f: am bdaee5ea: (-s ours) am 3737a3fa: DO...Flanker2015-09-290-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am f888d47c: am 91f5dc8f: am bdaee5ea: (-s ours) am 3737a3fa: DO NOT MERGE st...Flanker2015-09-290-0/+0
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | am 91f5dc8f: am bdaee5ea: (-s ours) am 3737a3fa: DO NOT MERGE stagefright: fi...Flanker2015-09-290-0/+0
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | am bdaee5ea: (-s ours) am 3737a3fa: DO NOT MERGE stagefright: fix AMessage::F...Flanker2015-09-290-0/+0
| | | | |\ \ \ | | | | | |/ /
| | | | | * | am 3737a3fa: DO NOT MERGE stagefright: fix AMessage::FromParcelFlanker2015-09-291-3/+22
| | | | | |\ \ | | | | | | |/
| | | | | | * DO NOT MERGE stagefright: fix AMessage::FromParcelFlanker2015-09-251-3/+22
* | | | | | | am 99214848: am 5226d6b7: am e64d4870: am 2b8cd9cb: stagefright: fix AMessage...Flanker2015-09-291-3/+25
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 5226d6b7: am e64d4870: am 2b8cd9cb: stagefright: fix AMessage::FromParcelFlanker2015-09-291-3/+25
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am e64d4870: am 2b8cd9cb: stagefright: fix AMessage::FromParcelFlanker2015-09-291-3/+25
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | am 2b8cd9cb: stagefright: fix AMessage::FromParcelFlanker2015-09-291-3/+25
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | stagefright: fix AMessage::FromParcelFlanker2015-09-251-3/+25
* | | | | | | DO NOT MERGE - Fix build for commit 69ae6a87Andy Hung2015-09-221-1/+1
* | | | | | | am 9b9612fb: am 92504274: am 7e1d645f: am a8f90d57: Merge "IAudioFlinger: fix...Wei Jia2015-09-211-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /