summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of c0bf836f to masterElliott Hughes2014-05-211-31/+31
|\
| * am ad71caf2: am 3b6da6bf: Merge "Move frameworks/av off private API."Elliott Hughes2014-05-221-31/+31
| |\
| | * am 3b6da6bf: Merge "Move frameworks/av off private API."Elliott Hughes2014-05-221-31/+31
| | |\
| | | * Move frameworks/av off private API.Elliott Hughes2014-05-211-31/+31
* | | | resolved conflicts for merge of b1080917 to masterElliott Hughes2014-05-211-10/+10
|\ \ \ \ | |/ / /
| * | | am acbd9492: am d084206d: Merge "Move frameworks/av off __futex_syscall3."Elliott Hughes2014-05-221-10/+10
| |\ \ \ | | |/ /
| | * | am d084206d: Merge "Move frameworks/av off __futex_syscall3."Elliott Hughes2014-05-221-10/+10
| | |\ \ | | | |/
| | | * Move frameworks/av off __futex_syscall3.Elliott Hughes2014-05-211-10/+10
* | | | Merge "audio policy: split audio policy library"Eric Laurent2014-05-221-1/+1
|\ \ \ \
| * | | | audio policy: split audio policy libraryEric Laurent2014-05-211-1/+1
* | | | | Merge "Remove the last of the references."Marco Nelissen2014-05-211-3/+3
|\ \ \ \ \
| * | | | | Remove the last of the references.Marco Nelissen2014-05-211-3/+3
* | | | | | Merge "Use pointers instead of references because C"Marco Nelissen2014-05-201-62/+101
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Use pointers instead of references because CMarco Nelissen2014-05-201-62/+101
* | | | | | 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-202-5/+26
|\ \ \ \ \ \
| * | | | | | Add docs, releaseOutputBufferAtTime, seekTo.Marco Nelissen2014-05-192-5/+26
| |/ / / / /
* | | | | | Merge "Add HEVC decoder support to ACodec bug: 14571712"Rachad2014-05-192-0/+4
|\ \ \ \ \ \
| * | | | | | Add HEVC decoder support to ACodecRachad2014-05-142-0/+4
* | | | | | | Merge "Use new channel count functions for audio masks"Andy Hung2014-05-197-12/+17
|\ \ \ \ \ \ \
| * | | | | | | Use new channel count functions for audio masksAndy Hung2014-05-167-12/+17
| | |/ / / / / | |/| | | | |
* | | | | | | Merge "Pass stereo gains as packed minifloat"Glenn Kasten2014-05-193-7/+11
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Pass stereo gains as packed minifloatGlenn Kasten2014-05-193-7/+11
| |/ / / / /
* | | | | | 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
| | |\ \ \ | | | | |/ | | | |/|
| | | * | libstagefright foundation: fix uninitialized varibale warningAmit Pundir2014-05-151-1/+1
* | | | | Fix build.Marco Nelissen2014-05-151-3/+3
* | | | | Merge "Unify error/status codes"Marco Nelissen2014-05-156-145/+155
|\ \ \ \ \
| * | | | | Unify error/status codesMarco Nelissen2014-05-156-145/+155
* | | | | | Merge "Hook up event handling in NDK MediaDrm API"Jeff Tinker2014-05-151-5/+68
|\ \ \ \ \ \
| * | | | | | Hook up event handling in NDK MediaDrm APIJeff Tinker2014-05-151-5/+68
| |/ / / / /
* | | | | | 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-159-149/+235
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | |
| * | | | | Update OMX messages for 64 bitAndy Hung2014-05-149-149/+235
* | | | | | Only export necessary symbolsMarco Nelissen2014-05-147-25/+114
| |_|_|_|/ |/| | | |
* | | | | Merge "Fix typos and pointer math."Marco Nelissen2014-05-142-8/+6
|\ \ \ \ \
| * | | | | Fix typos and pointer math.Marco Nelissen2014-05-142-8/+6
* | | | | | WIP: MediaDrm NDK APIsJeff Tinker2014-05-132-0/+607
|/ / / / /
* | | | | Some crypto stuff, error codesMarco Nelissen2014-05-135-9/+436
|/ / / /
* | | | Merge "Add AMediaCodec callback"Marco Nelissen2014-05-131-13/+106
|\ \ \ \
| * | | | Add AMediaCodec callbackMarco Nelissen2014-05-091-13/+106
* | | | | Fix bit rot in AudioStreamInSourceGlenn Kasten2014-05-091-1/+1
* | | | | Allow placement of Pipe buffer to be specifiedGlenn Kasten2014-05-091-4/+7