summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-devAndy Hung2015-08-281-2/+2
|\
| * Merge "libmedia: clear reply data for IEffect command" into klp-devAndy Hung2015-08-281-2/+2
| |\
| | * libmedia: clear reply data for IEffect commandAndy Hung2015-08-271-2/+2
* | | am 0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0Nick Kralevich2015-08-271-0/+2
|\ \ \ | |/ /
| * | IMediaPlayer.cpp: make sure structures are initialized to 0Nick Kralevich2015-08-271-0/+2
| |/
* | am 9a2be5d4: Merge "DO NOT MERGE - Fix software video decoder buffer size cal...Abhishek Arya2015-08-251-1/+1
|\ \ | |/
| * Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" int...Abhishek Arya2015-08-251-1/+1
| |\
| | * DO NOT MERGE - Fix software video decoder buffer size calculationMarco Nelissen2015-08-241-1/+1
* | | am a5f50e98: DO NOT MERGE - SoftwareRenderer: sanity check buffer size before...Wei Jia2015-08-251-0/+7
|\ \ \ | |/ /
| * | DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.Wei Jia2015-08-241-0/+7
| |/
* | am af7e33f6: libstagefright: check overflow before memory allocation in OMXCo...Wei Jia2015-08-231-0/+3
|\ \ | |/
| * libstagefright: check overflow before memory allocation in OMXCodec.cppWei Jia2015-08-231-0/+3
* | am dedaca6f: Limit allocations to avoid out-of-memoryMarco Nelissen2015-08-231-4/+12
|\ \ | |/
| * Limit allocations to avoid out-of-memoryMarco Nelissen2015-08-211-4/+12
* | 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 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 8de6d690: Fix build break DO NOT MERGEJeff Tinker2015-08-211-1/+1
|\ \ \ | |/ /
| * | Fix build break DO NOT MERGEJeff Tinker2015-08-211-1/+1
* | | 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 5aa887ef: am 59bfb7aa: (-s ours) am 18a8124f: am da0a48d2: (-s ours) am 60...Marco Nelissen2015-08-200-0/+0
|\ \ \ | |/ /
| * | am 59bfb7aa: (-s ours) am 18a8124f: am da0a48d2: (-s ours) am 6020f066: am b2...Marco Nelissen2015-08-200-0/+0
| |\ \
| | * \ am 18a8124f: am da0a48d2: (-s ours) am 6020f066: am b294a97a: am 6cba5819: am...Marco Nelissen2015-08-200-0/+0
| | |\ \
| | | * \ am da0a48d2: (-s ours) am 6020f066: am b294a97a: am 6cba5819: am 51bfaf6c: am...Marco Nelissen2015-08-200-0/+0
| | | |\ \
| | | | * \ am 6020f066: am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07:...Marco Nelissen2015-08-201-6/+16
| | | | |\ \
| | | | | * \ am b294a97a: am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE...Marco Nelissen2015-08-201-6/+16
| | | | | |\ \
| | | | | | * \ am 6cba5819: am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gr...Marco Nelissen2015-08-201-6/+16
| | | | | | |\ \
| | | | | | | * \ am 51bfaf6c: am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on a...Marco Nelissen2015-08-201-6/+16
| | | | | | | |\ \
| | | | | | | | * \ am 1afea551: am ce73af07: DO NOT MERGE Fail more gracefully on allocation fai...Marco Nelissen2015-08-201-6/+16
| | | | | | | | |\ \
| | | | | | | | | * \ am ce73af07: DO NOT MERGE Fail more gracefully on allocation failureMarco Nelissen2015-08-201-6/+16
| | | | | | | | | |\ \
| | | | | | | | | | * | DO NOT MERGE Fail more gracefully on allocation failureMarco Nelissen2015-08-201-6/+16
* | | | | | | | | | | | resolved conflicts for merge of 8a064aa8 to klp-modular-devMarco Nelissen2015-08-201-7/+19
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "Fail more gracefully on allocation failure" into klp-devMarco Nelissen2015-08-201-7/+20
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fail more gracefully on allocation failureMarco Nelissen2015-08-191-7/+20
* | | | | | | | | | | | | am 522019f1: Merge "libstagefright: fix handling of mSampleTimeEntries and mN...Wei Jia2015-08-201-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes...Wei Jia2015-08-201-1/+13
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in Sam...Wei Jia2015-08-191-1/+13
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
* | | | | | | | | | | | | am 635d38a8: Merge "Check RTSP payload length" into klp-devAbhishek Arya2015-08-201-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "Check RTSP payload length" into klp-devAbhishek Arya2015-08-201-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Check RTSP payload lengthMarco Nelissen2015-08-191-2/+3
| | | |/ / / / / / / / / / | | |/| | | | | | | | | |
* | | | | | | | | | | | | am 2c880dde: Merge "Sanity check padding/delay values for gapless playback" i...Abhishek Arya2015-08-201-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "Sanity check padding/delay values for gapless playback" into klp-devAbhishek Arya2015-08-201-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Sanity check padding/delay values for gapless playbackMarco Nelissen2015-08-181-0/+7
| | |/ / / / / / / / / / /
* | | | | | | | | | | | | Merge commit '6ae815e0' into HEADWei Jia2015-08-201-1/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInfor...Wei Jia2015-08-201-1/+19
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationO...Wei Jia2015-08-201-1/+19
| | | |/ / / / / / / / / / | | |/| | | | | | | | | |
* | | | | | | | | | | | | am b2ae4351: libstagefright: fix overflow in pvdec_api.cpp.Wei Jia2015-08-201-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /