summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Do not acknowledge flush() on start() for static tracksAndy Hung2015-08-241-3/+6
* am 7b06f9ba: am fa11fd5b: resolved conflicts for merge of 327afffb to lmp-mr1...Robert Shih2015-08-241-1/+16
|\
| * am fa11fd5b: resolved conflicts for merge of 327afffb to lmp-mr1-ub-devRobert Shih2015-08-241-1/+16
| |\
| | * resolved conflicts for merge of 327afffb to lmp-mr1-ub-devRobert Shih2015-08-241-1/+16
| | |\
| | | * am 4bb4736e: am 4c6556d1: am 8cf3564d: am eecc406f: am 3b42241a: Merge "Preve...Robert Shih2015-08-221-2/+21
| | | |\
| | | | * am 4c6556d1: am 8cf3564d: am eecc406f: am 3b42241a: Merge "Prevent integer is...Robert Shih2015-08-221-2/+21
| | | | |\
| | | | | * am 8cf3564d: am eecc406f: am 3b42241a: Merge "Prevent integer issues in ID3::...Robert Shih2015-08-221-2/+21
| | | | | |\
| | | | | | * am eecc406f: am 3b42241a: Merge "Prevent integer issues in ID3::Iterator::fin...Robert Shih2015-08-221-2/+21
| | | | | | |\
| | | | | | | * am 3b42241a: Merge "Prevent integer issues in ID3::Iterator::findFrame" into ...Robert Shih2015-08-221-2/+21
| | | | | | | |\
| | | | | | | | * Merge "Prevent integer issues in ID3::Iterator::findFrame" into klp-devRobert Shih2015-08-221-2/+21
| | | | | | | | |\
| | | | | | | | | * Prevent integer issues in ID3::Iterator::findFrameJoshua J. Drake2015-08-211-2/+21
* | | | | | | | | | am 76dea1de: libstagefright: check overflow before memory allocation in OMXCo...Wei Jia2015-08-241-0/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | libstagefright: check overflow before memory allocation in OMXCodec.cppWei Jia2015-08-211-0/+3
* | | | | | | | | | am e857d28d: Merge "TimestretchBufferProvider: getNextBuffer should follow AP...Andy Hung2015-08-211-23/+26
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "TimestretchBufferProvider: getNextBuffer should follow API" into mnc-devAndy Hung2015-08-211-23/+26
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | TimestretchBufferProvider: getNextBuffer should follow APIAndy Hung2015-08-211-23/+26
* | | | | | | | | | | am 39515ddc: am 47b90fe2: (-s ours) am b69a01a5: am 07a2e912: am 323d22e7: am...Wei Jia2015-08-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 47b90fe2: (-s ours) am b69a01a5: am 07a2e912: am 323d22e7: am 8319fadb: am...Wei Jia2015-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | am b69a01a5: am 07a2e912: am 323d22e7: am 8319fadb: am f814f84e: (-s ours) am...Wei Jia2015-08-210-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | am 07a2e912: am 323d22e7: am 8319fadb: am f814f84e: (-s ours) am d8816a13: DO...Wei Jia2015-08-210-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | |
| | | | * | | | | | | am 323d22e7: am 8319fadb: am f814f84e: (-s ours) am d8816a13: DO NOT MERGE li...Wei Jia2015-08-210-0/+0
| | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / | | | | | |/| | | | |
| | | | | * | | | | | am 8319fadb: am f814f84e: (-s ours) am d8816a13: DO NOT MERGE libstagefright:...Wei Jia2015-08-210-0/+0
| | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / | | | | | | |/| | | |
| | | | | | * | | | | am f814f84e: (-s ours) am d8816a13: DO NOT MERGE libstagefright: Fix crash in...Wei Jia2015-08-210-0/+0
| | | | | | |\ \ \ \ \ | | | | | | | | |/ / / | | | | | | | |/| | |
| | | | | | | * | | | am d8816a13: DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessageWei Jia2015-08-211-15/+51
| | | | | | | |\ \ \ \ | | | | | | | | | |/ / | | | | | | | | |/| |
| | | | | | | | * | | DO NOT MERGE libstagefright: Fix crash in convertMetaDataToMessageWei Jia2015-08-211-15/+51
* | | | | | | | | | | am 1221759c: am ce61bb6a: (-s ours) am 52a9a61b: am bb64d2fb: am 21b14554: am...Jeff Tinker2015-08-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am ce61bb6a: (-s ours) am 52a9a61b: am bb64d2fb: am 21b14554: am e4a9d859: am...Jeff Tinker2015-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am 52a9a61b: am bb64d2fb: am 21b14554: am e4a9d859: am ca095ac2: (-s ours) am...Jeff Tinker2015-08-210-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | am bb64d2fb: am 21b14554: am e4a9d859: am ca095ac2: (-s ours) am 8de6d690: Fi...Jeff Tinker2015-08-210-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | am 21b14554: am e4a9d859: am ca095ac2: (-s ours) am 8de6d690: Fix build break...Jeff Tinker2015-08-210-0/+0
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / /
| | | | | * | | | | | am e4a9d859: am ca095ac2: (-s ours) am 8de6d690: Fix build break DO NOT MERGEJeff Tinker2015-08-210-0/+0
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / /
| | | | | | * | | | | am ca095ac2: (-s ours) am 8de6d690: Fix build break DO NOT MERGEJeff Tinker2015-08-210-0/+0
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / /
| | | | | | | * | | | am 8de6d690: Fix build break DO NOT MERGEJeff Tinker2015-08-211-1/+1
| | | | | | | |\ \ \ \ | | | | | | | | |/ / /
| | | | | | | | * | | Fix build break DO NOT MERGEJeff Tinker2015-08-211-1/+1
* | | | | | | | | | | am 53edaffa: am b7d6e637: (-s ours) am 186993d7: am 4bbd5238: am 9c9f8620: am...Jeff Tinker2015-08-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am b7d6e637: (-s ours) am 186993d7: am 4bbd5238: am 9c9f8620: am f8bf4acb: am...Jeff Tinker2015-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am 186993d7: am 4bbd5238: am 9c9f8620: am f8bf4acb: am fd1d6df5: (-s ours) am...Jeff Tinker2015-08-210-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | am 4bbd5238: am 9c9f8620: am f8bf4acb: am fd1d6df5: (-s ours) am c2153d0d: DO...Jeff Tinker2015-08-210-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | am 9c9f8620: am f8bf4acb: am fd1d6df5: (-s ours) am c2153d0d: DO NOT MERGE Pa...Jeff Tinker2015-08-210-0/+0
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / /
| | | | | * | | | | | am f8bf4acb: am fd1d6df5: (-s ours) am c2153d0d: DO NOT MERGE Part of fix for...Jeff Tinker2015-08-210-0/+0
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / /
| | | | | | * | | | | am fd1d6df5: (-s ours) am c2153d0d: DO NOT MERGE Part of fix for libmedia OOB...Jeff Tinker2015-08-210-0/+0
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / /
| | | | | | | * | | | am c2153d0d: DO NOT MERGE Part of fix for libmedia OOB write anywhereJeff Tinker2015-08-211-3/+3
| | | | | | | |\ \ \ \ | | | | | | | | |/ / /
| | | | | | | | * | | DO NOT MERGE Part of fix for libmedia OOB write anywhereJeff Tinker2015-08-201-3/+3
* | | | | | | | | | | am e2c89788: am b512e0a3: (-s ours) am 0ea1da27: am 5f126c0d: am e93a33a8: am...Abhishek Arya2015-08-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am b512e0a3: (-s ours) am 0ea1da27: am 5f126c0d: am e93a33a8: am 8cc71bc8: Me...Abhishek Arya2015-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am 0ea1da27: am 5f126c0d: am e93a33a8: am 8cc71bc8: Merge "DO NOT MERGE Part ...Abhishek Arya2015-08-211-3/+3
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | am 5f126c0d: am e93a33a8: am 8cc71bc8: Merge "DO NOT MERGE Part of fix for li...Abhishek Arya2015-08-211-3/+3
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | am e93a33a8: am 8cc71bc8: Merge "DO NOT MERGE Part of fix for libmedia OOB wr...Abhishek Arya2015-08-211-3/+3
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / /
| | | | | * | | | | | am 8cc71bc8: Merge "DO NOT MERGE Part of fix for libmedia OOB write anywhere"...Abhishek Arya2015-08-211-3/+3
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / /
| | | | | | * | | | | Merge "DO NOT MERGE Part of fix for libmedia OOB write anywhere" into lmp-devAbhishek Arya2015-08-211-3/+3
| | | | | | |\ \ \ \ \