summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am a27fe8d7: am 2fd79fa3: am cb2acbfe: am 635d38a8: Merge "Check RTSP payload...Abhishek Arya2015-08-201-2/+3
|\
| * am 2fd79fa3: am cb2acbfe: am 635d38a8: Merge "Check RTSP payload length" into...Abhishek Arya2015-08-201-2/+3
| |\
| | * am cb2acbfe: am 635d38a8: Merge "Check RTSP payload length" into klp-devAbhishek Arya2015-08-201-2/+3
| | |\
| | | * 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 776bfd80: am 8a55bcb6: resolved conflicts for merge of ced2dd3c to lmp-devMarco Nelissen2015-08-201-0/+7
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 8a55bcb6: resolved conflicts for merge of ced2dd3c to lmp-devMarco Nelissen2015-08-201-0/+7
| |\ \ \ \ \ | | |/ / / /
| | * | | | resolved conflicts for merge of ced2dd3c to lmp-devMarco Nelissen2015-08-201-0/+7
| | |\ \ \ \ | | | |/ / /
| | | * | | 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
| | | | | |/
* | | | | | am 0af43510: am 2562495d: am a590baca: Merge commit \'6ae815e0\' into HEADWei Jia2015-08-201-1/+19
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 2562495d: am a590baca: Merge commit \'6ae815e0\' into HEADWei Jia2015-08-201-1/+19
| |\ \ \ \ \ | | |/ / / /
| | * | | | am a590baca: Merge commit \'6ae815e0\' into HEADWei Jia2015-08-201-1/+19
| | |\ \ \ \ | | | |/ / /
| | | * | | 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 e3cb2507: am 4b995f73: Merge "libstagefright: fix handling of mSampleTimeE...Wei Jia2015-08-202-3/+16
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 4b995f73: Merge "libstagefright: fix handling of mSampleTimeEntries and mN...Wei Jia2015-08-202-3/+16
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes...Wei Jia2015-08-202-3/+16
| | |\ \ \ \ \
| | | * | | | | libstagefright: fix handling of mSampleTimeEntries and mNumSampleSizes in Sam...Wei Jia2015-08-192-3/+16
* | | | | | | | am 84a4221e: am a9b3cd3c: am 5221133b: am b2ae4351: libstagefright: fix overf...Wei Jia2015-08-201-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am a9b3cd3c: am 5221133b: am b2ae4351: libstagefright: fix overflow in pvdec_...Wei Jia2015-08-201-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 5221133b: am b2ae4351: libstagefright: fix overflow in pvdec_api.cpp.Wei Jia2015-08-201-2/+2
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| / / / / | | | |/ / / /
| | | * | | | am b2ae4351: libstagefright: fix overflow in pvdec_api.cpp.Wei Jia2015-08-201-2/+2
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | libstagefright: fix overflow in pvdec_api.cpp.Wei Jia2015-08-201-2/+2
| | | | |/ /
* | | | | | am 25c00122: am 4ce86e78: am 5d7a381b: am 877c76ac: Merge "stagefright: check...Chong Zhang2015-08-181-2/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 4ce86e78: am 5d7a381b: am 877c76ac: Merge "stagefright: check IMemory::poi...Chong Zhang2015-08-181-2/+6
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 5d7a381b: am 877c76ac: Merge "stagefright: check IMemory::pointer() before...Chong Zhang2015-08-181-2/+6
| | |\ \ \ \ | | | |/ / /
| | | * | | am 877c76ac: Merge "stagefright: check IMemory::pointer() before using the al...Chong Zhang2015-08-181-2/+6
| | | |\ \ \ | | | | |/ /
| | | | * | Merge "stagefright: check IMemory::pointer() before using the allocation" int...Chong Zhang2015-08-181-2/+6
| | | | |\ \ | | | | | |/ | | | | |/|
| | | | | * stagefright: check IMemory::pointer() before using the allocationChong Zhang2015-08-171-2/+6
* | | | | | am 3e9ed500: am 8a1a5d17: am 9707195b: am f97b6bee: Merge "Check integer over...Jon Larimer2015-08-181-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 8a1a5d17: am 9707195b: am f97b6bee: Merge "Check integer overflow to preve...Jon Larimer2015-08-181-1/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 9707195b: am f97b6bee: Merge "Check integer overflow to prevent memory cor...Jon Larimer2015-08-181-1/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | am f97b6bee: Merge "Check integer overflow to prevent memory corruption" into...Jon Larimer2015-08-181-1/+2
| | | |\ \ \ | | | | |/ /
| | | | * | Merge "Check integer overflow to prevent memory corruption" into klp-devJon Larimer2015-08-181-1/+2
| | | | |\ \
| | | | | * | Check integer overflow to prevent memory corruptionJeff Tinker2015-08-161-1/+2
| | | | | |/
| | | * | | am 2ed42aea: Merge "do not dequeue from native window after we hit fatal erro...Jon Larimer2015-08-181-0/+10
| | | |\ \ \ | | | | |/ /
| | | | * | Merge "do not dequeue from native window after we hit fatal error -- DO NOT M...Jon Larimer2015-08-181-0/+10
| | | | |\ \
| | | | | * | do not dequeue from native window after we hit fatal error -- DO NOT MERGEChong Zhang2015-08-171-0/+10
| | | | | |/
* | | | | | am 4b153ff9: am 2f3c04a4: resolved conflicts for merge of 6035c811 to lmp-devNick Kralevich2015-08-181-8/+40
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 2f3c04a4: resolved conflicts for merge of 6035c811 to lmp-devNick Kralevich2015-08-181-8/+40
| |\ \ \ \ \ | | |/ / / /
| | * | | | resolved conflicts for merge of 6035c811 to lmp-devNick Kralevich2015-08-181-8/+40
| | |\ \ \ \ | | | |/ / /
| | | * | | am 0d46c937: Merge "MPEG4Source::fragmentedRead: check range before writing i...Jon Larimer2015-08-181-8/+40
| | | |\ \ \ | | | | |/ /
| | | | * | Merge "MPEG4Source::fragmentedRead: check range before writing into buffers" ...Jon Larimer2015-08-181-8/+40
| | | | |\ \
| | | | | * | MPEG4Source::fragmentedRead: check range before writing into buffersRobert Shih2015-08-171-8/+40
* | | | | | | am 484ebc81: am a1e462e5: am 0afecdeb: am aa1cc741: Merge "Check buffer size ...Jon Larimer2015-08-181-0/+8
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am a1e462e5: am 0afecdeb: am aa1cc741: Merge "Check buffer size before using ...Jon Larimer2015-08-181-0/+8
| |\ \ \ \ \ \ | | |/ / / / /