summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Expand)AuthorAgeFilesLines
* am 3662ca10: Merge "StagefrightMetadataRetriever: handle error returned from ...Wei Jia2015-09-211-1/+4
|\
| * Merge "StagefrightMetadataRetriever: handle error returned from convertMetaDa...Wei Jia2015-09-211-1/+4
| |\
| | * StagefrightMetadataRetriever: handle error returned from convertMetaDataToMes...Wei Jia2015-09-181-1/+4
* | | Fix BuildIan Pedowitz2015-09-181-1/+1
* | | Merge "stagefright: Move google mpeg2 codec into media_codecs_google_tv.xml" ...Lajos Molnar2015-09-182-9/+29
|\ \ \
| * | | stagefright: Move google mpeg2 codec into media_codecs_google_tv.xmlSungmin Choi2015-09-172-9/+29
* | | | Merge "stagefright: only pass valid framerates in msg and meta" into mnc-dr-devLajos Molnar2015-09-181-2/+2
|\ \ \ \
| * | | | stagefright: only pass valid framerates in msg and metaLajos Molnar2015-09-171-2/+2
| |/ / /
* | | | am 12d4a6a2: DO NOT MERGE Avoid size_t overflow in base64 decoding once againWonsik Kim2015-09-182-93/+20
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | DO NOT MERGE Avoid size_t overflow in base64 decoding once againWonsik Kim2015-09-182-93/+20
| |/
* | am 866a12a7: am 3c4216e5: am 2fa6a5ad: am 4d27a468: am 92efd0c5: am b5611b84:...Wonsik Kim2015-09-162-20/+93
|\ \ | |/
| * am 3c4216e5: am 2fa6a5ad: am 4d27a468: am 92efd0c5: am b5611b84: Merge "Rever...Wonsik Kim2015-09-162-20/+93
| |\
| | * am 2fa6a5ad: am 4d27a468: am 92efd0c5: am b5611b84: Merge "Revert "Avoid size...Wonsik Kim2015-09-162-20/+93
| | |\
| | | * am 92efd0c5: am b5611b84: Merge "Revert "Avoid size_t overflow in base64 deco...Wonsik Kim2015-09-162-20/+93
| | | |\
| | | | * Revert "Avoid size_t overflow in base64 decoding once again"Wonsik Kim2015-09-112-20/+93
| | * | | am c259acce: am f7c40163: am 5f5fc26c: am 322e2dc5: Merge "Avoid size_t overf...Wonsik Kim2015-09-162-93/+20
| | |\ \ \ | | | |/ /
| | | * | am 5f5fc26c: am 322e2dc5: Merge "Avoid size_t overflow in base64 decoding onc...Wonsik Kim2015-09-162-93/+20
| | | |\ \ | | | | |/
| | | | * Avoid size_t overflow in base64 decoding once againWonsik Kim2015-09-092-93/+20
* | | | | am 4374b187: Merge "NuCachedSource2: fix possible erroneous early free" into ...Wonsik Kim2015-09-144-7/+21
|\ \ \ \ \ | |/ / / /
| * | | | Merge "NuCachedSource2: fix possible erroneous early free" into mnc-devWonsik Kim2015-09-144-7/+21
| |\ \ \ \
| | * | | | NuCachedSource2: fix possible erroneous early freeWonsik Kim2015-09-094-7/+21
* | | | | | am 393eb647: Merge "Avoid size_t overflow in base64 decoding once again" into...Wonsik Kim2015-09-112-93/+20
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Avoid size_t overflow in base64 decoding once again" into mnc-devWonsik Kim2015-09-112-93/+20
| |\ \ \ \ \
| | * | | | | Avoid size_t overflow in base64 decoding once againWonsik Kim2015-09-072-93/+20
| | |/ / / /
* | | | | | Merge "libstagefright: Do not add audio codecs to resource manager. They are ...Ronghua Wu2015-09-111-2/+5
|\ \ \ \ \ \
| * | | | | | libstagefright: Do not add audio codecs to resource manager. They are too sma...Ronghua Wu2015-09-101-2/+5
* | | | | | | 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