frameworks_av.git - frameworks/av

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for merge of b52c152d to master	Eric Laurent	2014-05-30	4	-2/+129
\|\
\| *	audio policy: add routing update client interface	Eric Laurent	2014-05-29	4	-2/+129
\| *	DO NOT MERGE: libstagefright: Add Opus support to ACodec::getPortFormat	Vignesh Venkatasubramanian	2014-05-29	1	-0/+18
\| *	DO NOT MERGE - IAudioPolicyService interface extension for patch panel	Eric Laurent	2014-05-28	2	-2/+275
\| *	DO NOT MERGE - IAudioFlinger interface extension for patch panel	Eric Laurent	2014-05-28	1	-1/+171
* \|	am 0289d545: am 6ed77c13: am 2d0e8d8f: Merge "libcpustats: Turn on -Werror"	Mark Salyzyn	2014-05-30	2	-3/+4
\|\ \
\| * \	am 6ed77c13: am 2d0e8d8f: Merge "libcpustats: Turn on -Werror"	Mark Salyzyn	2014-05-30	2	-3/+4
\| \|\ \
\| \| * \	am 2d0e8d8f: Merge "libcpustats: Turn on -Werror"	Mark Salyzyn	2014-05-30	2	-3/+4
\| \| \|\ \
\| \| \| * \|	libcpustats: Turn on -Werror	Mark Salyzyn	2014-05-30	2	-3/+4
* \| \| \| \|	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
* \| \| \| \| \|	Merge "getSampletime -> getSampleTime"	Marco Nelissen	2014-05-29	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	getSampletime -> getSampleTime	Marco Nelissen	2014-05-29	1	-1/+1
* \| \| \| \| \| \|	Merge "libstagefright: Add Opus support to ACodec::getPortFormat"	Lajos Molnar	2014-05-29	1	-0/+18
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	libstagefright: Add Opus support to ACodec::getPortFormat	Vignesh Venkatasubramanian	2014-05-29	1	-0/+18
* \| \| \| \| \| \|	Fix some NuPlayer issues.	Marco Nelissen	2014-05-28	2	-7/+10
* \| \| \| \| \| \|	Merge "IAudioPolicyService interface extension for patch panel"	Eric Laurent	2014-05-28	2	-2/+275
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	IAudioPolicyService interface extension for patch panel	Eric Laurent	2014-05-27	2	-2/+275
* \| \| \| \| \| \|	Merge "IAudioFlinger interface extension for patch panel"	Eric Laurent	2014-05-28	1	-1/+171
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	IAudioFlinger interface extension for patch panel	Eric Laurent	2014-05-27	1	-1/+171
\| \|/ / / / /
* \| \| \| \| \|	Merge "Remove codec callback for now."	Marco Nelissen	2014-05-27	1	-1/+3
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Remove codec callback for now.	Marco Nelissen	2014-05-23	1	-1/+3
* \| \| \| \| \|	Merge "Move validation of frameCount from set to openRecord_l"	Glenn Kasten	2014-05-27	1	-18/+24
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Move validation of frameCount from set to openRecord_l	Glenn Kasten	2014-05-22	1	-18/+24
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	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
\| \| \|\ \ \ \ \| \| \| \| \|_\|/ \| \| \| \|/\| \|
\| \| \| * \| \|	Move frameworks/av off <sys/atomics.h>.	Elliott Hughes	2014-05-22	1	-3/+2
* \| \| \| \| \|	resolved conflicts for merge of f285c91e to master	Elliott Hughes	2014-05-22	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| / / \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	am c10b874c: am d5516339: Merge "Move frameworks/av from fdprintf to POSIX dp...	Calin Juravle	2014-05-22	1	-1/+1
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am d5516339: Merge "Move frameworks/av from fdprintf to POSIX dprintf."	Calin Juravle	2014-05-22	1	-1/+1
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	Move frameworks/av from fdprintf to POSIX dprintf.	Elliott Hughes	2014-05-22	1	-1/+1
* \| \| \| \|	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
\| \|/ / / / /