Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "Fail more gracefully on allocation failure" | Marco Nelissen | 2014-06-17 | 1 | -7/+26 |
|\ | |||||
| * | Fail more gracefully on allocation failure | Marco Nelissen | 2014-06-17 | 1 | -7/+26 |
* | | Merge "Fix logging" | Marco Nelissen | 2014-06-16 | 1 | -4/+4 |
|\ \ | |/ | |||||
| * | Fix logging | Marco Nelissen | 2014-06-13 | 1 | -4/+4 |
* | | Merge "support for CEA-608 closed caption" | Chong Zhang | 2014-06-14 | 2 | -0/+7 |
|\ \ | |||||
| * | | support for CEA-608 closed caption | Chong Zhang | 2014-06-13 | 2 | -0/+7 |
* | | | Merge "refactor getTrackInfo()" | Chong Zhang | 2014-06-12 | 5 | -35/+57 |
|\ \ \ | |/ / | | / | |/ |/| | |||||
| * | refactor getTrackInfo() | Chong Zhang | 2014-06-13 | 5 | -35/+57 |
* | | am 2a8270e6: am c323737d: Merge "Offer a type-safe album art interface." | Elliott Hughes | 2014-06-12 | 2 | -17/+5 |
|\ \ | |||||
| * \ | am c323737d: Merge "Offer a type-safe album art interface." | Elliott Hughes | 2014-06-12 | 2 | -17/+5 |
| |\ \ | |||||
| | * \ | Merge "Offer a type-safe album art interface." | Elliott Hughes | 2014-06-11 | 2 | -17/+5 |
| | |\ \ | |||||
| | | * | | Offer a type-safe album art interface. | Elliott Hughes | 2014-06-11 | 2 | -17/+5 |
* | | | | | am ca44dc79: am 8d6d8f54: Merge "Add libcrypto for users of libstagefright." | Christopher Ferris | 2014-06-11 | 1 | -3/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am 8d6d8f54: Merge "Add libcrypto for users of libstagefright." | Christopher Ferris | 2014-06-10 | 1 | -3/+0 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Add libcrypto for users of libstagefright. | Christopher Ferris | 2014-06-10 | 1 | -3/+0 |
| | |/ / | |||||
* | | | | resolved conflicts for merge of 281b884c to master | Christopher Ferris | 2014-06-11 | 1 | -0/+7 |
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | |||||
| * | | am d3af4265: Merge "Link libcrypto for MD5_* functions." | Christopher Ferris | 2014-06-10 | 1 | -0/+7 |
| |\ \ | | |/ | |||||
| | * | Link libcrypto for MD5_* functions. | Christopher Ferris | 2014-06-09 | 1 | -0/+7 |
| * | | am 17a6dd60: DO NOT MERGE: MediaCodecList: remove force-added codecs for vide... | Lajos Molnar | 2014-06-05 | 1 | -9/+0 |
| |\ \ | |||||
| | * | | DO NOT MERGE: MediaCodecList: remove force-added codecs for videoeditor | Lajos Molnar | 2014-05-29 | 1 | -9/+0 |
* | | | | Merge "Remove unneeded code" | Marco Nelissen | 2014-06-10 | 1 | -6/+0 |
|\ \ \ \ | |||||
| * | | | | Remove unneeded code | Marco Nelissen | 2014-06-10 | 1 | -6/+0 |
* | | | | | add back HEVC SoftOMX decoder | Lajos Molnar | 2014-06-06 | 3 | -0/+853 |
* | | | | | Remove SoftOMX HEVC decoder | Lajos Molnar | 2014-06-06 | 3 | -849/+0 |
* | | | | | am 8a454611: Merge "stagefright: added support, and SoftOMX decoder, for HEVC... | Lajos Molnar | 2014-06-06 | 9 | -8/+1023 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge "stagefright: added support, and SoftOMX decoder, for HEVC" into lmp-pr... | Lajos Molnar | 2014-06-06 | 9 | -8/+1023 |
| |\ \ \ \ \ | |||||
| | * | | | | | stagefright: added support, and SoftOMX decoder, for HEVC | Harish Mahendrakar | 2014-06-06 | 9 | -8/+1023 |
* | | | | | | | Merge "Guard against malformed files" | Marco Nelissen | 2014-06-06 | 1 | -4/+28 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | Guard against malformed files | Marco Nelissen | 2014-06-06 | 1 | -4/+28 |
* | | | | | | | Merge "do not drop TS packet on discontinuity at payload start" | Chong Zhang | 2014-06-06 | 1 | -1/+3 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | do not drop TS packet on discontinuity at payload start | Chong Zhang | 2014-06-06 | 1 | -1/+3 |
* | | | | | | | Merge "Make AAC decoder behavior after flush consistent with non-flush" | Marco Nelissen | 2014-06-06 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Make AAC decoder behavior after flush consistent with non-flush | Marco Nelissen | 2014-06-05 | 1 | -0/+1 |
* | | | | | | | am 270facca: We still need the raw codec | Marco Nelissen | 2014-06-05 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | |||||
| * | | | | | We still need the raw codec | Marco Nelissen | 2014-06-05 | 1 | -0/+1 |
* | | | | | | am 9042b116: Merge "MediaCodecList: remove force-added codecs for videoeditor... | Lajos Molnar | 2014-06-05 | 1 | -5/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | MediaCodecList: remove force-added codecs for videoeditor | Lajos Molnar | 2014-05-29 | 1 | -5/+0 |
| |/ / / / | |||||
| * | | | | DO NOT MERGE: libstagefright: Add Opus support to ACodec::getPortFormat | Vignesh Venkatasubramanian | 2014-05-29 | 1 | -0/+18 |
* | | | | | am b6af7c63: am 05eaf105: Merge "Mp3decoder: Remove unused arm assembly files" | Narayan Kamath | 2014-06-03 | 5 | -1413/+0 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | am 05eaf105: Merge "Mp3decoder: Remove unused arm assembly files" | Narayan Kamath | 2014-06-03 | 5 | -1413/+0 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Merge "Mp3decoder: Remove unused arm assembly files" | Narayan Kamath | 2014-06-03 | 5 | -1413/+0 |
| | |\ \ \ | |||||
| | | * | | | Mp3decoder: Remove unused arm assembly files | Ashok Bhat | 2014-05-27 | 5 | -1413/+0 |
* | | | | | | Merge "MPEG4Extractor: guard against missing stbl." | Robert Shih | 2014-06-02 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | MPEG4Extractor: guard against missing stbl. | Robert Shih | 2014-05-19 | 1 | -1/+2 |
* | | | | | | | Merge "AAC decoder: compensate limiter delay" | Jean-Michel Trivi | 2014-05-29 | 5 | -218/+973 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | AAC decoder: compensate limiter delay | Jean-Michel Trivi | 2014-05-29 | 5 | -218/+973 |
* | | | | | | | | libstagefright: Add Opus support to ACodec::getPortFormat | Vignesh Venkatasubramanian | 2014-05-29 | 1 | -0/+18 |
|/ / / / / / / | |||||
* | | | | | | | am 79262cfc: am 5b756bfd: am 8b187f4a: Merge "Move frameworks/av off <sys/ato... | Elliott Hughes | 2014-05-23 | 1 | -3/+2 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | / / | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | am 5b756bfd: am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>." | Elliott Hughes | 2014-05-22 | 1 | -3/+2 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>." | Elliott Hughes | 2014-05-22 | 1 | -3/+2 |
| | |\ \ \ \ | | | | |/ / | | | |/| | |