Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | resolved conflicts for merge of c0bf836f to master | Elliott Hughes | 2014-05-21 | 1 | -31/+31 |
|\ | |||||
| * | am ad71caf2: am 3b6da6bf: Merge "Move frameworks/av off private API." | Elliott Hughes | 2014-05-22 | 1 | -31/+31 |
| |\ | |||||
| | * | am 3b6da6bf: Merge "Move frameworks/av off private API." | Elliott Hughes | 2014-05-22 | 1 | -31/+31 |
| | |\ | |||||
| | | * | Move frameworks/av off private API. | Elliott Hughes | 2014-05-21 | 1 | -31/+31 |
* | | | | resolved conflicts for merge of b1080917 to master | Elliott Hughes | 2014-05-21 | 1 | -10/+10 |
|\ \ \ \ | |/ / / | |||||
| * | | | am acbd9492: am d084206d: Merge "Move frameworks/av off __futex_syscall3." | Elliott Hughes | 2014-05-22 | 1 | -10/+10 |
| |\ \ \ | | |/ / | |||||
| | * | | am d084206d: Merge "Move frameworks/av off __futex_syscall3." | Elliott Hughes | 2014-05-22 | 1 | -10/+10 |
| | |\ \ | | | |/ | |||||
| | | * | Move frameworks/av off __futex_syscall3. | Elliott Hughes | 2014-05-21 | 1 | -10/+10 |
* | | | | Merge "audio policy: split audio policy library" | Eric Laurent | 2014-05-22 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | audio policy: split audio policy library | Eric Laurent | 2014-05-21 | 1 | -1/+1 |
* | | | | | Merge "Remove the last of the references." | Marco Nelissen | 2014-05-21 | 1 | -3/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Remove the last of the references. | Marco Nelissen | 2014-05-21 | 1 | -3/+3 |
* | | | | | | Merge "Use pointers instead of references because C" | Marco Nelissen | 2014-05-20 | 1 | -62/+101 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Use pointers instead of references because C | Marco Nelissen | 2014-05-20 | 1 | -62/+101 |
* | | | | | | Merge "Fix OGG recognition for 64 bit" | Andy Hung | 2014-05-20 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Fix OGG recognition for 64 bit | Andy Hung | 2014-05-19 | 1 | -1/+1 |
* | | | | | | Merge "Add docs, releaseOutputBufferAtTime, seekTo." | Marco Nelissen | 2014-05-20 | 2 | -5/+26 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add docs, releaseOutputBufferAtTime, seekTo. | Marco Nelissen | 2014-05-19 | 2 | -5/+26 |
| |/ / / / / | |||||
* | | | | | | Merge "Add HEVC decoder support to ACodec bug: 14571712" | Rachad | 2014-05-19 | 2 | -0/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add HEVC decoder support to ACodec | Rachad | 2014-05-14 | 2 | -0/+4 |
* | | | | | | | Merge "Use new channel count functions for audio masks" | Andy Hung | 2014-05-19 | 7 | -12/+17 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use new channel count functions for audio masks | Andy Hung | 2014-05-16 | 7 | -12/+17 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge "Pass stereo gains as packed minifloat" | Glenn Kasten | 2014-05-19 | 3 | -7/+11 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | Pass stereo gains as packed minifloat | Glenn Kasten | 2014-05-19 | 3 | -7/+11 |
| |/ / / / / | |||||
* | | | | | | Fix warnings, re-enable -Werror. | Ruben Brunk | 2014-05-17 | 5 | -14/+15 |
* | | | | | | Fixbuild | Ruben Brunk | 2014-05-17 | 1 | -1/+0 |
* | | | | | | camera2: Adding TIFF writing utilities. | Ruben Brunk | 2014-05-17 | 33 | -0/+4424 |
* | | | | | | am 6b787cb8: am 1b8b8793: am 3059e27d: Merge "libstagefright foundation: fix ... | Andreas Huber | 2014-05-16 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | |||||
| * | | | | am 1b8b8793: am 3059e27d: Merge "libstagefright foundation: fix uninitialized... | Andreas Huber | 2014-05-16 | 1 | -1/+1 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | am 3059e27d: Merge "libstagefright foundation: fix uninitialized varibale war... | Andreas Huber | 2014-05-16 | 1 | -1/+1 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | libstagefright foundation: fix uninitialized varibale warning | Amit Pundir | 2014-05-15 | 1 | -1/+1 |
* | | | | | Fix build. | Marco Nelissen | 2014-05-15 | 1 | -3/+3 |
* | | | | | Merge "Unify error/status codes" | Marco Nelissen | 2014-05-15 | 6 | -145/+155 |
|\ \ \ \ \ | |||||
| * | | | | | Unify error/status codes | Marco Nelissen | 2014-05-15 | 6 | -145/+155 |
* | | | | | | Merge "Hook up event handling in NDK MediaDrm API" | Jeff Tinker | 2014-05-15 | 1 | -5/+68 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Hook up event handling in NDK MediaDrm API | Jeff Tinker | 2014-05-15 | 1 | -5/+68 |
| |/ / / / / | |||||
* | | | | | | ACodec: remove PTS log spam | Lajos Molnar | 2014-05-15 | 2 | -4/+2 |
* | | | | | | Merge "Send 64 bit OMX codec handling to 32 bit MediaServer" | Andy Hung | 2014-05-15 | 3 | -0/+22 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Send 64 bit OMX codec handling to 32 bit MediaServer | Andy Hung | 2014-05-14 | 3 | -0/+22 |
* | | | | | | | Merge "Update OMX messages for 64 bit" | Andy Hung | 2014-05-15 | 9 | -149/+235 |
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | | | |||||
| * | | | | | Update OMX messages for 64 bit | Andy Hung | 2014-05-14 | 9 | -149/+235 |
* | | | | | | Only export necessary symbols | Marco Nelissen | 2014-05-14 | 7 | -25/+114 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge "Fix typos and pointer math." | Marco Nelissen | 2014-05-14 | 2 | -8/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Fix typos and pointer math. | Marco Nelissen | 2014-05-14 | 2 | -8/+6 |
* | | | | | | WIP: MediaDrm NDK APIs | Jeff Tinker | 2014-05-13 | 2 | -0/+607 |
|/ / / / / | |||||
* | | | | | Some crypto stuff, error codes | Marco Nelissen | 2014-05-13 | 5 | -9/+436 |
|/ / / / | |||||
* | | | | Merge "Add AMediaCodec callback" | Marco Nelissen | 2014-05-13 | 1 | -13/+106 |
|\ \ \ \ | |||||
| * | | | | Add AMediaCodec callback | Marco Nelissen | 2014-05-09 | 1 | -13/+106 |
* | | | | | Fix bit rot in AudioStreamInSource | Glenn Kasten | 2014-05-09 | 1 | -1/+1 |
* | | | | | Allow placement of Pipe buffer to be specified | Glenn Kasten | 2014-05-09 | 1 | -4/+7 |