summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Expand)AuthorAgeFilesLines
* am c336136d: Merge "libstagefright: fix A_Refl to return immediately when the...Wei Jia2015-09-082-2/+5
|\
| * Merge "libstagefright: fix A_Refl to return immediately when there is an erro...Wei Jia2015-09-082-2/+5
| |\
| | * libstagefright: fix A_Refl to return immediately when there is an error.Wei Jia2015-09-042-2/+5
* | | am 3af22d1f: am a6e476cb: am 2cec2b4c: am 9bbc490e: am facd279e: am 7d34959b:...Marco Nelissen2015-09-042-254/+377
|\ \ \ | |/ /
| * | am a6e476cb: am 2cec2b4c: am 9bbc490e: am facd279e: am 7d34959b: am 16e12007:...Marco Nelissen2015-09-042-254/+377
| |\ \ | | |/ | |/|
| | * am 2cec2b4c: am 9bbc490e: am facd279e: am 7d34959b: am 16e12007: am 74888428:...Marco Nelissen2015-09-042-254/+377
| | |\
| | | * am facd279e: am 7d34959b: am 16e12007: am 74888428: Merge "Fix timedtext pars...Marco Nelissen2015-09-042-254/+377
| | | |\
| | | | * am 16e12007: am 74888428: Merge "Fix timedtext parsing" into klp-devMarco Nelissen2015-09-032-254/+377
| | | | |\
| | | | | * am 74888428: Merge "Fix timedtext parsing" into klp-devMarco Nelissen2015-09-032-254/+377
| | | | | |\
| | | | | | * Merge "Fix timedtext parsing" into klp-devMarco Nelissen2015-09-032-254/+377
| | | | | | |\
| | | | | | | * Fix timedtext parsingMarco Nelissen2015-08-312-254/+377
| | | | | * | | am 9d916c77: DO NOT MERGE - libstagefright: sanity check size before derefere...Wei Jia2015-09-031-5/+16
| | | | | |\ \ \ | | | | | | |/ /
| | | | | | * | DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer...Wei Jia2015-09-031-5/+16
| | * | | | | | resolved conflicts for 3b8747ca to lmp-mr1-ub-devWei Jia2015-09-041-8/+28
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | am 7ea22fce: am c6a2815e: DO NOT MERGE - libstagefright: sanity check size be...Wei Jia2015-09-041-8/+28
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer...Wei Jia2015-09-031-8/+28
| | * | | | | | am eda49b16: am 3f79dbfc: am d77786c6: am a6c650a9: am 436b32d1: am d2605273:...Wonsik Kim2015-09-031-5/+15
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | am d77786c6: am a6c650a9: am 436b32d1: am d2605273: Ogg: avoid size_t overflo...Wonsik Kim2015-09-031-5/+15
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | am 436b32d1: am d2605273: Ogg: avoid size_t overflow in base64 decodingWonsik Kim2015-09-031-5/+15
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | am d2605273: Ogg: avoid size_t overflow in base64 decodingWonsik Kim2015-09-031-5/+15
| | | | | |\ \ \ | | | | | | |/ /
| | | | | | * | Ogg: avoid size_t overflow in base64 decodingWonsik Kim2015-09-031-5/+15
| | | | | | |/
| | | | | * | am 9a2be5d4: Merge "DO NOT MERGE - Fix software video decoder buffer size cal...Abhishek Arya2015-08-251-1/+1
| | | | | |\ \ | | | | | | |/
| | | | | | * Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" int...Abhishek Arya2015-08-251-1/+1
| | | | | | |\
| | | | | | | * DO NOT MERGE - Fix software video decoder buffer size calculationMarco Nelissen2015-08-241-1/+1
| | | | | * | | am a5f50e98: DO NOT MERGE - SoftwareRenderer: sanity check buffer size before...Wei Jia2015-08-251-0/+7
| | | | | |\ \ \ | | | | | | |/ /
| | | | | | * | DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.Wei Jia2015-08-241-0/+7
| | | | | | |/
| | * | | | | am 524f9946: am 76b3fb29: am 4fd0696a: am 4f797b92: Merge "DO NOT MERGE - Fix...Abhishek Arya2015-08-251-1/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | am 4fd0696a: am 4f797b92: Merge "DO NOT MERGE - Fix software video decoder bu...Abhishek Arya2015-08-251-1/+1
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" int...Abhishek Arya2015-08-251-1/+1
| | | | |\ \ \
| | | | | * | | DO NOT MERGE - Fix software video decoder buffer size calculationMarco Nelissen2015-08-241-1/+1
| | * | | | | | am fb385ac6: am 571d9731: Merge commit \'c642d411\' into HEADWei Jia2015-08-251-1/+9
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge commit 'c642d411' into HEADWei Jia2015-08-251-1/+9
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.Wei Jia2015-08-241-1/+8
| | | | |/ / /
| | * | | | | am 41de4ba1: am cf69487d: am 6f80b09f: am 252a8c09: am 0f3ab16c: am af7e33f6:...Wei Jia2015-08-241-0/+3
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | am 6f80b09f: am 252a8c09: am 0f3ab16c: am af7e33f6: libstagefright: check ove...Wei Jia2015-08-231-0/+3
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | am 0f3ab16c: am af7e33f6: libstagefright: check overflow before memory alloca...Wei Jia2015-08-231-0/+3
| | | | |\ \ \ | | | | | |/ /
| | | | | * | am af7e33f6: libstagefright: check overflow before memory allocation in OMXCo...Wei Jia2015-08-231-0/+3
| | | | | |\ \ | | | | | | |/
| | | | | | * libstagefright: check overflow before memory allocation in OMXCodec.cppWei Jia2015-08-231-0/+3
| | * | | | | am 2c02f5ee: am 719cd33e: am 492bba08: am d18bb120: am 09f71c56: am dedaca6f:...Marco Nelissen2015-08-241-4/+12
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | am 492bba08: am d18bb120: am 09f71c56: am dedaca6f: Limit allocations to avoi...Marco Nelissen2015-08-231-4/+12
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | am 09f71c56: am dedaca6f: Limit allocations to avoid out-of-memoryMarco Nelissen2015-08-231-4/+12
| | | | |\ \ \ | | | | | |/ /
| | | | | * | am dedaca6f: Limit allocations to avoid out-of-memoryMarco Nelissen2015-08-231-4/+12
| | | | | |\ \ | | | | | | |/
| | | | | | * Limit allocations to avoid out-of-memoryMarco Nelissen2015-08-211-4/+12
* | | | | | | am f9156653: Merge "libstagefright: sanity check size before dereferencing po...Wei Jia2015-09-031-8/+28
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "libstagefright: sanity check size before dereferencing pointer in Util...Wei Jia2015-09-031-8/+28
| |\ \ \ \ \ \
| | * | | | | | libstagefright: sanity check size before dereferencing pointer in Utils.cppWei Jia2015-09-011-8/+28
* | | | | | | | am bc9ab7cd: Merge "Ogg: avoid size_t overflow in base64 decoding" into mnc-devWonsik Kim2015-09-031-5/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Ogg: avoid size_t overflow in base64 decoding" into mnc-devWonsik Kim2015-09-031-5/+15
| |\ \ \ \ \ \ \
| | * | | | | | | Ogg: avoid size_t overflow in base64 decodingWonsik Kim2015-09-031-5/+15
| | |/ / / / / /
* | | | | | | | am d35955dd: Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before fi...Lajos Molnar2015-09-021-4/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /