summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | | |\ \ | | | | | |/
| | | | | * GenericSource: reset mDrmManagerClient when mDataSource is cleared.Wei Jia2015-10-211-0/+1
| | * | | | Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" in...Jon Larimer2015-10-211-1/+3
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" in...Jon Larimer2015-10-211-1/+3
| | | |\ \ \ | | | | |/ /
| | | | * | Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" in...Jon Larimer2015-10-201-1/+3
| | | | |\ \ | | | | | |/
| | | | | * Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" in...Jon Larimer2015-10-201-1/+3
| | | | | |\
| | | | | | * Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" in...Jon Larimer2015-10-201-1/+3
| | | | | | |\
| | | | | | | * Merge "stagefright: MPEG4Extractor: allow 'hdlr' box before first track" into...Jon Larimer2015-10-201-1/+3
| | | | | | | |\
| | | | | | | | * stagefright: MPEG4Extractor: allow 'hdlr' box before first trackLajos Molnar2015-10-021-1/+3
| | | | | | * | | am 3b4a72ac: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely c...Wei Jia2015-10-085-3/+22
| | | | | | |\ \ \ | | | | | | | |/ /
| | | | | | | * | Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateB...Wei Jia2015-10-085-3/+22
| | | | | | | |\ \
| | | | | | | | * | DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.Wei Jia2015-10-075-3/+22
| | * | | | | | | | am f106f9e4: am 15e991bd: resolved conflicts for 0b09da7a to lmp-mr1-devWei Jia2015-10-085-0/+19
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | resolved conflicts for 0b09da7a to lmp-mr1-devWei Jia2015-10-085-0/+19
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | am 04c02eeb: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely c...Wei Jia2015-10-085-3/+22
| | | | |\ \ \ \ \ \ | | | | | |/ / / / /
| | | | | * | | | | Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateB...Wei Jia2015-10-085-3/+22
| | | | | |\ \ \ \ \
| | | | | | * | | | | DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.Wei Jia2015-10-075-3/+22
| | * | | | | | | | | am d4df7559: am 39f64a1e: am 8b713f11: am b75a78db: am fc0e2a87: am 7ed8d1ef:...Wei Jia2015-10-061-2/+19
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | am 8b713f11: am b75a78db: am fc0e2a87: am 7ed8d1ef: ID3: check possible integ...Wei Jia2015-10-061-2/+19
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | am b75a78db: am fc0e2a87: am 7ed8d1ef: ID3: check possible integer overflow f...Wei Jia2015-10-061-2/+19
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / /
| | | | | * | | | | | am fc0e2a87: am 7ed8d1ef: ID3: check possible integer overflow for extendedHe...Wei Jia2015-10-061-2/+19
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / / | | | | | |/| / / / / | | | | | | |/ / / /
| | | | | | * | | | am 7ed8d1ef: ID3: check possible integer overflow for extendedHeaderSize and ...Wei Jia2015-10-061-2/+19
| | | | | | |\ \ \ \ | | | | | | | |/ / /
| | | | | | | * | | ID3: check possible integer overflow for extendedHeaderSize and paddingSize.Wei Jia2015-10-061-2/+19
| | | | | | | |/ /
* | | | | | | | | libstagefright: check requested memory size before allocation for SoftMPEG4En...Wei Jia2015-11-202-0/+18
* | | | | | | | | ALooper::awaitResponse gets reply and returns immediately if the looper is st...Ronghua Wu2015-10-261-16/+4
* | | | | | | | | Merge "Workaround for busy wait bug" into mnc-dr-devGlenn Kasten2015-10-221-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Workaround for busy wait bugGlenn Kasten2015-10-221-1/+2
* | | | | | | | | | Merge "Allow ALooper::awaitResponse to return immediately if the looper is st...Ronghua Wu2015-10-222-3/+30
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Allow ALooper::awaitResponse to return immediately if the looper is stopped.Ronghua Wu2015-10-222-3/+30
| |/ / / / / / / / /
* | | | | | | | | | Merge "GenericSource: reset mDecryptHandle when mDataSource is cleared." into...Wei Jia2015-10-221-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | GenericSource: reset mDecryptHandle when mDataSource is cleared.Wei Jia2015-10-221-0/+1
* | | | | | | | | | | Merge "Fix offset adjustment when skipping off-spec meta chunk" into mnc-dr-devMarco Nelissen2015-10-221-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix offset adjustment when skipping off-spec meta chunkMarco Nelissen2015-10-221-3/+3
| |/ / / / / / / / /
* | | | | | | | | | Merge "GenericSource: reset mDrmManagerClient when mDataSource is cleared." i...Wei Jia2015-10-211-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | GenericSource: reset mDrmManagerClient when mDataSource is cleared.Wei Jia2015-10-191-0/+1
* | | | | | | | | | Reconcile with master after mass cherrypicksMarco Nelissen2015-10-161-0/+1
* | | | | | | | | | Merge "SoftAVCDec: Exit gracefully when memory allocation fails in the decode...Marco Nelissen2015-10-161-0/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | SoftAVCDec: Exit gracefully when memory allocation fails in the decoderHarish Mahendrakar2015-10-161-0/+11
* | | | | | | | | | | Merge "SoftAVCDec: Added a check for unsupported resolutions" into mnc-dr-devMarco Nelissen2015-10-161-0/+11
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /