summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-6.0.0_r26' into cm-13.0Ricardo Cerqueira2015-11-0535-350/+611
|\
| * Merge "AudioTrack: Prevent stop() from reissuing last marker event" into mnc-...Glenn Kasten2015-10-071-3/+12
| |\
| | * AudioTrack: Prevent stop() from reissuing last marker eventAndy Hung2015-10-061-3/+12
| * | am 39d91e7b: Merge "ID3: check possible integer overflow for extendedHeaderSi...Wei Jia2015-10-061-2/+19
| |\ \
| | * \ Merge "ID3: check possible integer overflow for extendedHeaderSize and paddin...Wei Jia2015-10-061-2/+19
| | |\ \
| | | * | ID3: check possible integer overflow for extendedHeaderSize and paddingSize.Wei Jia2015-10-051-2/+19
| * | | | am 6f14568b: am f1790258: am 5e92fded: am 64cdd5f2: am f2cf2bd7: am 07395f4c:...Marco Nelissen2015-10-061-2/+9
| |\ \ \ \ | | |/ / /
| | * | | am f1790258: am 5e92fded: am 64cdd5f2: am f2cf2bd7: am 07395f4c: am 00f5fa82:...Marco Nelissen2015-10-061-2/+9
| | |\ \ \
| | | * \ \ am 5e92fded: am 64cdd5f2: am f2cf2bd7: am 07395f4c: am 00f5fa82: am 74d1927e:...Marco Nelissen2015-10-061-2/+9
| | | |\ \ \
| | | | * \ \ am f2cf2bd7: am 07395f4c: am 00f5fa82: am 74d1927e: Merge "Check NAL size bef...Marco Nelissen2015-10-061-2/+9
| | | | |\ \ \
| | | | | * \ \ am 07395f4c: am 00f5fa82: am 74d1927e: Merge "Check NAL size before use" into...Marco Nelissen2015-10-061-2/+9
| | | | | |\ \ \
| | | | | | * \ \ am 00f5fa82: am 74d1927e: Merge "Check NAL size before use" into klp-devMarco Nelissen2015-10-061-2/+9
| | | | | | |\ \ \
| | | | | | | * \ \ am 74d1927e: Merge "Check NAL size before use" into klp-devMarco Nelissen2015-10-061-2/+9
| | | | | | | |\ \ \
| | | | | | | | * \ \ Merge "Check NAL size before use" into klp-devMarco Nelissen2015-10-061-2/+9
| | | | | | | | |\ \ \
| | | | | | | | | * | | Check NAL size before useMarco Nelissen2015-10-061-2/+9
| | | * | | | | | | | | am 3674abc0: am fb0d63df: am 62d89908: am df68d9d5: am 60b25aa0: am 9ab9c85e:...Wei Jia2015-10-061-0/+6
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | am 62d89908: am df68d9d5: am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: en...Wei Jia2015-10-061-0/+6
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / /
| | | | | * | | | | | | am df68d9d5: am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer s...Wei Jia2015-10-061-0/+6
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / /
| | | | | | * | | | | | am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not le...Wei Jia2015-10-061-0/+6
| | | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / /
| | | | | | | * | | | | am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not less than 8 for...Wei Jia2015-10-061-0/+6
| | | | | | | |\ \ \ \ \ | | | | | | | | |/ / / /
| | | | | | | | * | | | Merge "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentD...Wei Jia2015-10-061-0/+6
| | | | | | | | |\ \ \ \
| | | | | | | | | * | | | MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.Wei Jia2015-10-061-0/+6
| | | | | | | | | |/ / /
| * | | | | | | | | | | am 711e9dfc: am 8b3aa04a: am a0c94bc6: am 567ad5c6: am 7ce82583: am 13b6b51e:...Marco Nelissen2015-10-061-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am 8b3aa04a: am a0c94bc6: am 567ad5c6: am 7ce82583: am 13b6b51e: am f7d1f627:...Marco Nelissen2015-10-061-0/+5
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | am a0c94bc6: am 567ad5c6: am 7ce82583: am 13b6b51e: am f7d1f627: am 257b3bc5:...Marco Nelissen2015-10-061-0/+5
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | am 7ce82583: am 13b6b51e: am f7d1f627: am 257b3bc5: Don\'t crash when there\'...Marco Nelissen2015-10-061-0/+5
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / /
| | | | | * | | | | | | am 13b6b51e: am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal ...Marco Nelissen2015-10-061-0/+5
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / /
| | | | | | * | | | | | am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal frameMarco Nelissen2015-10-061-0/+5
| | | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / /
| | | | | | | * | | | | am 257b3bc5: Don\'t crash when there\'s no conceal frameMarco Nelissen2015-10-061-0/+5
| | | | | | | |\ \ \ \ \ | | | | | | | | |/ / / /
| | | | | | | | * | | | Don't crash when there's no conceal frameMarco Nelissen2015-10-051-0/+5
| | | | | | | | |/ / /
| | | | | | | * | | | am 3737a3fa: DO NOT MERGE stagefright: fix AMessage::FromParcelFlanker2015-09-291-3/+22
| | | | | | | |\ \ \ \ | | | | | | | | |/ / /
| | | | | | | | * | | DO NOT MERGE stagefright: fix AMessage::FromParcelFlanker2015-09-251-3/+22
| | | | | | | * | | | am 6272fa1b: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into klp-devJeff Tinker2015-09-171-0/+2
| | | | | | | |\ \ \ \ | | | | | | | | |/ / /
| | | | | | | | * | | Merge "DO NOT MERGE Fix vulnerability in mediaserver" into klp-devJeff Tinker2015-09-171-0/+2
| | | | | | | | |\ \ \
| | | | | | | | | * | | DO NOT MERGE Fix vulnerability in mediaserverJeff Tinker2015-09-161-0/+2
| | | | | | | * | | | | am f43125ed: Merge "Fix for security vulnerability in media server DO NOT MER...Jeff Tinker2015-09-171-1/+23
| | | | | | | |\ \ \ \ \ | | | | | | | | |/ / / /
| | | | | | | | * | | | Merge "Fix for security vulnerability in media server DO NOT MERGE" into klp-devJeff Tinker2015-09-171-1/+23
| | | | | | | | |\ \ \ \
| | | | | | | | | * | | | Fix for security vulnerability in media server DO NOT MERGEJeff Tinker2015-09-141-1/+23
| | | | | | | | | |/ / /
| | | | | | | * | | | | am ae922517: Merge "DO NOT MERGE - IAudioFlinger: always initialize variables...Wei Jia2015-09-171-10/+10
| | | | | | | |\ \ \ \ \ | | | | | | | | |/ / / /
| | | | | | | | * | | | DO NOT MERGE - IAudioFlinger: always initialize variables to ensure no info l...Wei Jia2015-09-161-10/+10
| | | | | | | * | | | | am b21a6420: Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous earl...Wonsik Kim2015-09-164-7/+21
| | | | | | | |\ \ \ \ \ | | | | | | | | |/ / / /
| | | | | | | | * | | | Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous early free" into ...Wonsik Kim2015-09-164-7/+21
| | | | | | | | |\ \ \ \
| | | | | | | | | * | | | DO NOT MERGE NuCachedSource2: fix possible erroneous early freeWonsik Kim2015-09-144-7/+21
| | | | | | | * | | | | | am 741a3351: Merge "DO NOT MERGE - IAudioFlinger: clear config before reading...Wei Jia2015-09-111-2/+4
| | | | | | | |\ \ \ \ \ \ | | | | | | | | |/ / / / /
| | | | | | | | * | | | | Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parc...Wei Jia2015-09-111-2/+4
| | | | | | | | |\ \ \ \ \
| | | | | | | | | * | | | | DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.Wei Jia2015-09-101-2/+4
| | | | | | | | | |/ / / /
| | | | | | | * | | | | | am b659b4c7: Merge "DO NOT MERGE fix build" into klp-devWonsik Kim2015-09-111-0/+1
| | | | | | | |\ \ \ \ \ \ | | | | | | | | |/ / / / /
| | | | | | | | * | | | | Merge "DO NOT MERGE fix build" into klp-devWonsik Kim2015-09-111-0/+1
| | | | | | | | |\ \ \ \ \
| | | | | | | | | * | | | | DO NOT MERGE fix buildWonsik Kim2015-09-111-0/+1
| | | | | | | * | | | | | | am 1784a8db: Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding onc...Wonsik Kim2015-09-112-94/+21
| | | | | | | |\ \ \ \ \ \ \ | | | | | | | | |/ / / / / /