Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 839d11d1: Merge changes I0a744dc7,Id993a70d | Mark Salyzyn | 2014-04-15 | 34 | -239/+133 |
|\ | |||||
| * | Merge changes I0a744dc7,Id993a70d | Mark Salyzyn | 2014-04-15 | 34 | -239/+133 |
| |\ | |||||
| | * | media: use size_t for integer iterator to Vector::size() | Mark Salyzyn | 2014-04-15 | 8 | -22/+22 |
| | * | media: 64 bit compile issues | Mark Salyzyn | 2014-04-15 | 28 | -221/+115 |
| |/ | |||||
* | | am 1df2557a: Merge "Remove code markers" | Dmitriy Ivanov | 2014-04-15 | 1 | -78/+0 |
|\ \ | |/ | |||||
| * | Merge "Remove code markers" | Dmitriy Ivanov | 2014-04-15 | 1 | -78/+0 |
| |\ | |||||
| | * | Remove code markers | Dmitriy Ivanov | 2014-04-15 | 1 | -78/+0 |
| |/ | |||||
* | | am 432ed3d6: Merge "libstagefright: fix 64-bit warnings" | Mark Salyzyn | 2014-04-15 | 14 | -46/+54 |
|\ \ | |/ | |||||
| * | Merge "libstagefright: fix 64-bit warnings" | Mark Salyzyn | 2014-04-15 | 14 | -46/+54 |
| |\ | |||||
| | * | libstagefright: fix 64-bit warnings | Colin Cross | 2014-04-14 | 14 | -46/+54 |
| |/ | |||||
* | | am 9829344d: Merge "media: memset sizeof argument issues" | Mark Salyzyn | 2014-04-14 | 3 | -3/+3 |
|\ \ | |/ | |||||
| * | Merge "media: memset sizeof argument issues" | Mark Salyzyn | 2014-04-14 | 3 | -3/+3 |
| |\ | |||||
| | * | media: memset sizeof argument issues | Mark Salyzyn | 2014-04-11 | 3 | -3/+3 |
* | | | am e5238893: Merge "Fix aosp_arm64 mirror-aosp-master build 1119326" | Mark Salyzyn | 2014-04-11 | 3 | -6/+6 |
|\ \ \ | |/ / | |||||
| * | | Merge "Fix aosp_arm64 mirror-aosp-master build 1119326" | Mark Salyzyn | 2014-04-11 | 3 | -6/+6 |
| |\ \ | | |/ | |/| | |||||
| | * | Fix aosp_arm64 mirror-aosp-master build 1119326 | Mark Salyzyn | 2014-04-11 | 3 | -6/+6 |
| |/ | |||||
* | | am a133bc87: Merge "build fix for aosp-idea133 @ 1119318" | Mark Salyzyn | 2014-04-11 | 1 | -1/+0 |
|\ \ | |/ | |||||
| * | Merge "build fix for aosp-idea133 @ 1119318" | Mark Salyzyn | 2014-04-11 | 1 | -1/+0 |
| |\ | |||||
| | * | build fix for aosp-idea133 @ 1119318 | Mark Salyzyn | 2014-04-11 | 1 | -1/+0 |
* | | | am 0938c6f7: Merge "warnings be gone (4/4)" | Mark Salyzyn | 2014-04-11 | 1 | -2/+4 |
|\ \ \ | |/ / | |||||
| * | | Merge "warnings be gone (4/4)" | Mark Salyzyn | 2014-04-11 | 1 | -2/+4 |
| |\ \ | |||||
| | * | | warnings be gone (4/4) | Mark Salyzyn | 2014-04-11 | 1 | -2/+4 |
| |/ / | |||||
* | | | am 2a27a640: Merge "warnings be gone (3/4)" | Mark Salyzyn | 2014-04-11 | 1 | -2/+4 |
|\ \ \ | |/ / | |||||
| * | | Merge "warnings be gone (3/4)" | Mark Salyzyn | 2014-04-11 | 1 | -2/+4 |
| |\ \ | |||||
| | * | | warnings be gone (3/4) | Mark Salyzyn | 2014-04-11 | 1 | -2/+4 |
| |/ / | |||||
* | | | am 79724856: Merge "warnings be gone (2/4)" | Mark Salyzyn | 2014-04-11 | 1 | -5/+5 |
|\ \ \ | |/ / | |||||
| * | | Merge "warnings be gone (2/4)" | Mark Salyzyn | 2014-04-11 | 1 | -5/+5 |
| |\ \ | | |/ | |/| | |||||
| | * | warnings be gone (2/4) | Mark Salyzyn | 2014-04-11 | 1 | -5/+5 |
| |/ | |||||
* | | am 52a861d2: Merge "warnings be gone." | Mark Salyzyn | 2014-04-11 | 70 | -161/+211 |
|\ \ | |/ | |||||
| * | Merge "warnings be gone." | Mark Salyzyn | 2014-04-11 | 70 | -161/+211 |
| |\ | |||||
| | * | warnings be gone. | Andreas Huber | 2014-04-11 | 70 | -161/+211 |
| |/ | |||||
* | | am 51b3ea2b: Merge "64-bit: Correction to OMX_U32 and OMX_S32" | Glenn Kasten | 2014-04-03 | 7 | -16/+16 |
|\ \ | |/ | |||||
| * | Merge "64-bit: Correction to OMX_U32 and OMX_S32" | Glenn Kasten | 2014-04-03 | 7 | -16/+16 |
| |\ | |||||
| | * | 64-bit: Correction to OMX_U32 and OMX_S32 | Glenn Kasten | 2014-04-02 | 7 | -16/+16 |
* | | | am 93bbc834: Merge "Fix aac decoder flush" | Glenn Kasten | 2014-04-03 | 1 | -0/+6 |
|\ \ \ | |/ / | |||||
| * | | Merge "Fix aac decoder flush" | Glenn Kasten | 2014-04-03 | 1 | -0/+6 |
| |\ \ | | |/ | |||||
| | * | Fix aac decoder flush | Marco Nelissen | 2014-04-02 | 1 | -0/+6 |
* | | | am 81e0bd44: Add signature|system permission to MediaDrm signer APIs | Jeff Tinker | 2014-04-03 | 1 | -0/+16 |
|\ \ \ | |||||
| * | | | Add signature|system permission to MediaDrm signer APIs | Jeff Tinker | 2014-04-02 | 1 | -0/+16 |
* | | | | am 2b2fbe29: Merge "Fix decoder EOS handling" | Glenn Kasten | 2014-04-02 | 6 | -203/+213 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge "Fix decoder EOS handling" | Glenn Kasten | 2014-04-02 | 6 | -203/+213 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Fix decoder EOS handling | Marco Nelissen | 2014-04-02 | 6 | -203/+213 |
| |/ / | |||||
* | | | am 68d9d71a: Support CAST V2 Authentication in MediaDrm | Jeff Tinker | 2014-04-01 | 6 | -19/+154 |
|\ \ \ | | |/ | |/| | |||||
| * | | Support CAST V2 Authentication in MediaDrm | Jeff Tinker | 2014-03-29 | 6 | -19/+154 |
* | | | am 1000d426: am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more... | Lajos Molnar | 2014-03-28 | 3 | -56/+30 |
|\ \ \ | |/ / | |||||
| * | | am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with... | Lajos Molnar | 2014-03-28 | 3 | -56/+30 |
| |\ \ | |||||
| | * \ | Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQu... | Lajos Molnar | 2014-03-28 | 3 | -56/+30 |
| | |\ \ | |||||
| | | * | | DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue" | Lajos Molnar | 2014-03-27 | 3 | -56/+30 |
* | | | | | am 8bf96c01: am 3d4e4fcb: Merge "DO NOT MERGE: Revert "stagefright: allow for... | Lajos Molnar | 2014-03-28 | 2 | -10/+7 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am 3d4e4fcb: Merge "DO NOT MERGE: Revert "stagefright: allow for minUndequeue... | Lajos Molnar | 2014-03-28 | 2 | -10/+7 |
| |\ \ \ \ | | |/ / / |