summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dr15' into cm-13.0Steve Kondik2016-03-121-2/+7
|\
| * Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/fr...Steve Kondik2016-03-101-2/+7
| |\
| | * Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac...Marco Nelissen2016-01-121-1/+9
| | |\
| | | * Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac...Marco Nelissen2016-01-121-1/+9
| | | |\
| | | | * Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac...Marco Nelissen2016-01-121-1/+9
| | | | |\
| | | | | * Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac...Marco Nelissen2016-01-121-1/+9
| | | | | |\
| | | | | | * Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac...Marco Nelissen2016-01-121-1/+9
| | | | | | |\
| | | | | | | * Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7eMarco Nelissen2016-01-121-1/+9
| | | | | | | |\
| | | | | | | | * Fix out-of-bounds write am: 5403587a74 am: fb2eb86102Marco Nelissen2016-01-121-1/+9
| | | | | | | | |\
| | | | | | | | | * Fix out-of-bounds write am: 5403587a74Marco Nelissen2016-01-121-1/+9
| | | | | | | | | |\
| | | | | | | | | | * Fix out-of-bounds writeMarco Nelissen2016-01-121-1/+9
| | | | | | | | | | |\
| | | | | | | | | | | * Fix out-of-bounds writeMarco Nelissen2016-01-121-1/+9
| | | | | | * | | | | | DO NOT MERGE ANYWHERE Revert "fix possible overflow in effect wrappers."Eric Laurent2016-01-122-8/+2
| | * | | | | | | | | | fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: 3...Eric Laurent2016-01-122-2/+8
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: 3...Eric Laurent2016-01-122-2/+8
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: 3...Eric Laurent2016-01-122-2/+8
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / /
| | | | | * | | | | | | fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: 3...Eric Laurent2016-01-122-2/+8
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / /
| | | | | | * | | | | | fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: 3...Eric Laurent2016-01-122-2/+8
| | | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / /
| | | | | | | * | | | | fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: 3...Eric Laurent2016-01-122-2/+8
| | | | | | | |\ \ \ \ \ | | | | | | | | |/ / / /
| | | | | | | | * | | | fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0Eric Laurent2016-01-122-2/+8
| | | | | | | | |\ \ \ \ | | | | | | | | | |/ / /
| | | | | | | | | * | | fix possible overflow in effect wrappers. am: 9e29523b95Eric Laurent2016-01-122-2/+8
| | | | | | | | | |\ \ \ | | | | | | | | | | |/ /
| | | | | | | | | | * | fix possible overflow in effect wrappers.Eric Laurent2016-01-122-2/+8
| | | | | | | | | | |\ \ | | | | | | | | | | | |/
| | | | | | | | | | | * fix possible overflow in effect wrappers.Eric Laurent2016-01-112-2/+8
| | | | | | | | | | * | DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThreadAndy Hung2015-12-031-19/+42
| | | | | | | | | | |\ \ | | | | | | | | | | | |/
| | | | | | | | | | | * DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThreadAndy Hung2015-12-031-19/+42
| | | | | | | | | | * | DO NOT MERGE - libstagefright: check requested memory size before allocation ...Wei Jia2015-12-032-1/+18
| | | | | | | | | | |\ \ | | | | | | | | | | | |/
| | | | | | | | | | | * DO NOT MERGE - libstagefright: check requested memory size before allocation ...Wei Jia2015-12-032-1/+18
| | | | | | | | * | | | Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolT...Andy Hung2015-12-031-19/+42
| | | | | | | | |\ \ \ \ | | | | | | | | | |/ / /
| | | | | | | | | * | | Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolT...Andy Hung2015-12-031-19/+42
| | | | | | | | | |\ \ \
| | | | | | | | | | * | | DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThreadAndy Hung2015-12-021-19/+42
| | | | | | | | * | | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ...Wei Jia2015-12-032-0/+18
| | | | | | | | |\ \ \ \ \ | | | | | | | | | |/ / / /
| | | | | | | | | * | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ...Wei Jia2015-12-032-0/+18
| | | | | | | | | |/ / /
| | | | | | * | | | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ...Wei Jia2015-12-102-0/+18
| | | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / /
| | | | | | | * | | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ...Wei Jia2015-12-102-0/+18
| | | | | | * | | | | | DO NOT MERGE nuplayer: do not use cached source for wvm content am: 91a23ed95cChong Zhang2015-12-081-23/+32
| | | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / /
| | | | | | | * | | | | DO NOT MERGE nuplayer: do not use cached source for wvm contentChong Zhang2015-12-041-23/+32
| | * | | | | | | | | | Merge "Fix security vulnerability in ICrypto DO NOT MERGE" into mnc-dev am: 8...Jeff Tinker2015-12-091-1/+3
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Merge "Fix security vulnerability in ICrypto DO NOT MERGE" into mnc-dev am: 8...Jeff Tinker2015-12-101-1/+3
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | Merge "Fix security vulnerability in ICrypto DO NOT MERGE" into mnc-devJeff Tinker2015-12-091-1/+3
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / /
| | | | | * | | | | | | Fix security vulnerability in ICrypto DO NOT MERGEJeff Tinker2015-12-051-1/+3
| | | | | * | | | | | | libstagefright: check requested memory size before allocation for SoftMPEG4En...Wei Jia2015-12-032-0/+18
| | | | | * | | | | | | GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c8...Wei Jia2015-10-221-0/+1
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / /
| | | | | | * | | | | | GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c8...Wei Jia2015-10-221-0/+1
| | | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / /
| | | | | | | * | | | | GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c838Wei Jia2015-10-221-0/+1
| | | | | | | |\ \ \ \ \ | | | | | | | | |/ / / /
| | | | | | | | * | | | GenericSource: reset mDecryptHandle when mDataSource is cleared.Wei Jia2015-10-221-0/+1
| | | | | | | | |\ \ \ \ | | | | | | | | | |/ / /
| | | | | | | | | * | | GenericSource: reset mDecryptHandle when mDataSource is cleared.Wei Jia2015-10-221-0/+1
| | | | | * | | | | | | GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 22485...Wei Jia2015-10-211-0/+1
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / /
| | | | | | * | | | | | GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 22485...Wei Jia2015-10-211-0/+1
| | | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / /
| | | | | | | * | | | | GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 22485...Wei Jia2015-10-211-0/+1
| | | | | | | |\ \ \ \ \ | | | | | | | | |/ / / /
| | | | | | | | * | | | GenericSource: reset mDrmManagerClient when mDataSource is cleared.Wei Jia2015-10-211-0/+1
| | | | | | | | |\ \ \ \ | | | | | | | | | |/ / /