summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of b1080917 to masterElliott Hughes2014-05-213-14/+14
|\
| * am acbd9492: am d084206d: Merge "Move frameworks/av off __futex_syscall3."Elliott Hughes2014-05-223-14/+14
| |\
| | * am d084206d: Merge "Move frameworks/av off __futex_syscall3."Elliott Hughes2014-05-223-14/+14
| | |\
| | | * Merge "Move frameworks/av off __futex_syscall3."Elliott Hughes2014-05-223-14/+14
| | | |\
| | | | * Move frameworks/av off __futex_syscall3.Elliott Hughes2014-05-213-14/+14
| | | |/
* | | | Merge "audio policy: split audio policy library"Eric Laurent2014-05-223-5/+36
|\ \ \ \
| * | | | audio policy: split audio policy libraryEric Laurent2014-05-213-5/+36
* | | | | Merge "Remove the last of the references."Marco Nelissen2014-05-212-4/+4
|\ \ \ \ \
| * | | | | Remove the last of the references.Marco Nelissen2014-05-212-4/+4
* | | | | | Merge "audio policy: add new audio devices"Eric Laurent2014-05-201-0/+12
|\ \ \ \ \ \
| * | | | | | audio policy: add new audio devicesEric Laurent2014-05-191-0/+12
| | |/ / / / | |/| | | |
* | | | | | Merge "Fix include"Marco Nelissen2014-05-201-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Fix includeMarco Nelissen2014-05-201-1/+1
* | | | | | Merge "Use pointers instead of references because C"Marco Nelissen2014-05-202-84/+123
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Use pointers instead of references because CMarco Nelissen2014-05-202-84/+123
* | | | | | Merge "Fix OGG recognition for 64 bit"Andy Hung2014-05-201-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix OGG recognition for 64 bitAndy Hung2014-05-191-1/+1
* | | | | | Merge "Add docs, releaseOutputBufferAtTime, seekTo."Marco Nelissen2014-05-206-13/+133
|\ \ \ \ \ \
| * | | | | | Add docs, releaseOutputBufferAtTime, seekTo.Marco Nelissen2014-05-196-13/+133
| |/ / / / /
* | | | | | Merge "Update AudioMixer::getTrackName to save channelMask"Andy Hung2014-05-202-12/+9
|\ \ \ \ \ \
| * | | | | | Update AudioMixer::getTrackName to save channelMaskAndy Hung2014-05-162-12/+9
* | | | | | | Merge "Add HEVC decoder support to ACodec bug: 14571712"Rachad2014-05-193-0/+5
|\ \ \ \ \ \ \
| * | | | | | | Add HEVC decoder support to ACodecRachad2014-05-143-0/+5
* | | | | | | | Merge "Use new channel count functions for audio masks"Andy Hung2014-05-1911-22/+31
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Use new channel count functions for audio masksAndy Hung2014-05-1611-22/+31
| | |/ / / / / | |/| | | | |
* | | | | | | Merge "Pass stereo gains as packed minifloat"Glenn Kasten2014-05-1912-59/+74
|\ \ \ \ \ \ \
| * | | | | | | Pass stereo gains as packed minifloatGlenn Kasten2014-05-1912-59/+74
| |/ / / / / /
* | | | | | | am be2664da: am 4c9bde7a: am ce473c32: Merge "Codec Offload: Add NULL check a...Eric Laurent2014-05-191-1/+4
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | am 4c9bde7a: am ce473c32: Merge "Codec Offload: Add NULL check as mCallbackTh...Eric Laurent2014-05-191-1/+4
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | am ce473c32: Merge "Codec Offload: Add NULL check as mCallbackThread is NULL ...Eric Laurent2014-05-191-1/+4
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Merge "Codec Offload: Add NULL check as mCallbackThread is NULL when offloade...Eric Laurent2014-05-191-1/+4
| | | |\ \ \
| | | | * | | Codec Offload: Add NULL check as mCallbackThread is NULLUday Gupta2014-05-131-1/+4
* | | | | | | Fix warnings, re-enable -Werror.Ruben Brunk2014-05-175-14/+15
* | | | | | | FixbuildRuben Brunk2014-05-171-1/+0
* | | | | | | camera2: Adding TIFF writing utilities.Ruben Brunk2014-05-1733-0/+4424
* | | | | | | am 6b787cb8: am 1b8b8793: am 3059e27d: Merge "libstagefright foundation: fix ...Andreas Huber2014-05-161-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | |
| * | | | | am 1b8b8793: am 3059e27d: Merge "libstagefright foundation: fix uninitialized...Andreas Huber2014-05-161-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 3059e27d: Merge "libstagefright foundation: fix uninitialized varibale war...Andreas Huber2014-05-161-1/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "libstagefright foundation: fix uninitialized varibale warning"Andreas Huber2014-05-161-1/+1
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | libstagefright foundation: fix uninitialized varibale warningAmit Pundir2014-05-151-1/+1
| | | |/ /
* | | | | Fix build.Marco Nelissen2014-05-152-4/+4
* | | | | Merge "Unify error/status codes"Marco Nelissen2014-05-1512-218/+233
|\ \ \ \ \
| * | | | | Unify error/status codesMarco Nelissen2014-05-1512-218/+233
* | | | | | Merge "Hook up event handling in NDK MediaDrm API"Jeff Tinker2014-05-152-6/+69
|\ \ \ \ \ \
| * | | | | | Hook up event handling in NDK MediaDrm APIJeff Tinker2014-05-152-6/+69
| |/ / / / /
* | | | | | ACodec: remove PTS log spamLajos Molnar2014-05-152-4/+2
* | | | | | Merge "Send 64 bit OMX codec handling to 32 bit MediaServer"Andy Hung2014-05-153-0/+22
|\ \ \ \ \ \
| * | | | | | Send 64 bit OMX codec handling to 32 bit MediaServerAndy Hung2014-05-143-0/+22
* | | | | | | Merge "Update OMX messages for 64 bit"Andy Hung2014-05-1511-152/+238
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Update OMX messages for 64 bitAndy Hung2014-05-1411-152/+238