summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* libmedia: clear reply data for IEffect commandAndy Hung2015-09-021-2/+2
* NuPlayer: do not create audio decoder if the player is still in shutdown proc...Wei Jia2015-08-281-1/+3
* 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 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 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
| | | | | * | | 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 0ea1da27: am 5f126c0d: am e93a33a8: am 8cc71bc8: Merge "DO NOT MERGE Part ...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
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | DO NOT MERGE Part of fix for libmedia OOB write anywhereJeff Tinker2015-08-201-3/+3
| * | | | | | | | am 35fbcdd6: am 3d97de8c: am b8a84e59: am ef87594b: Merge "libstagefright: Fi...Nick Kralevich2015-08-201-22/+66
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am b8a84e59: am ef87594b: Merge "libstagefright: Fix crash in convertMetaData...Nick Kralevich2015-08-201-22/+66
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | am ef87594b: Merge "libstagefright: Fix crash in convertMetaDataToMessage" in...Nick Kralevich2015-08-201-22/+66
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | Merge "libstagefright: Fix crash in convertMetaDataToMessage" into lmp-devNick Kralevich2015-08-201-22/+66
| | | | |\ \ \ \ \
| | | | | * | | | | libstagefright: Fix crash in convertMetaDataToMessageWei Jia2015-08-191-22/+66
* | | | | | | | | | libstagefright: check overflow before memory allocation in OMXCodec.cppWei Jia2015-08-211-0/+3
* | | | | | | | | | am 99187615: am d3b6f9c1: am c5b9a48f: am a27fe8d7: am 2fd79fa3: am cb2acbfe:...Abhishek Arya2015-08-201-2/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am d3b6f9c1: am c5b9a48f: am a27fe8d7: am 2fd79fa3: am cb2acbfe: am 635d38a8:...Abhishek Arya2015-08-201-2/+3
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | 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 f526f687: am a07ad890: am 776bfd80: am 8a55bcb6: resolved conflicts for me...Marco Nelissen2015-08-201-0/+7
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | 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 f8f0e0b7: am 562be234: am f076fabf: am 0af43510: am 2562495d: am a590baca:...Wei Jia2015-08-201-0/+4
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 562be234: am f076fabf: am 0af43510: am 2562495d: am a590baca: Merge commit...Wei Jia2015-08-201-1/+19
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 0af43510: am 2562495d: am a590baca: Merge commit \'6ae815e0\' into HEADWei Jia2015-08-201-1/+19
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /