frameworks_av.git - frameworks/av

	Commit message (Expand)	Author	Age	Files	Lines
*	am 64b08d23: am cbb803a5: Merge "Remove superfluous OpenSSL include paths."	Kenny Root	2015-01-26	3	-5/+4
\|\
\| *	am cbb803a5: Merge "Remove superfluous OpenSSL include paths."	Kenny Root	2015-01-26	3	-5/+4
\| \|\
\| \| *	Remove superfluous OpenSSL include paths.	Adam Langley	2015-01-22	3	-5/+4
* \| \|	am 1f7101ee: am 64c496c8: Merge "Fix MTP delete" into lmp-mr1-dev	Marco Nelissen	2015-01-23	1	-2/+2
\|\ \ \
\| * \ \	Merge "Fix MTP delete" into lmp-mr1-dev	Marco Nelissen	2015-01-23	1	-2/+2
\| \|\ \ \
\| \| * \| \|	Fix MTP delete	Marco Nelissen	2015-01-23	1	-2/+2
* \| \| \| \|	am d8aff827: am ddc1216d: Merge "MPEG4Extractor: more NULL derefernce fixes i...	Robert Shih	2015-01-23	1	-1/+1
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge "MPEG4Extractor: more NULL derefernce fixes in parseChunk" into lmp-mr1...	Robert Shih	2015-01-23	1	-1/+1
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| \| * \| \|	MPEG4Extractor: more NULL derefernce fixes in parseChunk	Robert Shih	2015-01-21	1	-1/+1
* \| \| \| \|	am 0fe24de8: am c0c2366c: Merge "stagefright: do not reject SPL4 files outrig...	Ronghua Wu	2015-01-23	1	-0/+4
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge "stagefright: do not reject SPL4 files outright in SoftMpeg4 decoder" i...	Ronghua Wu	2015-01-23	1	-0/+4
\| \|\ \ \ \
\| \| * \| \| \|	stagefright: do not reject SPL4 files outright in SoftMpeg4 decoder	Ronghua Wu	2015-01-22	1	-0/+4
\| \| \|/ / /
* \| \| \| \|	am b3e1f71b: am 841d22b0: libstagefright: Use aligned width and height.	Ronghua Wu	2015-01-23	1	-2/+4
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	libstagefright: Use aligned width and height.	Ronghua Wu	2015-01-22	1	-2/+4
\| \|/ / /
* \| \| \|	am 9e308de9: am 4d4ea7f7: Merge "do not use paused postition if it\'s not ava...	Chong Zhang	2015-01-16	1	-2/+8
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "do not use paused postition if it's not available" into lmp-mr1-dev	Chong Zhang	2015-01-16	1	-2/+8
\| \|\ \ \
\| \| * \| \|	do not use paused postition if it's not available	Chong Zhang	2015-01-15	1	-2/+8
\| * \| \| \|	MidiFile: report correct state during transient period when start() is called...	Wei Jia	2015-01-14	1	-1/+1
* \| \| \| \|	am e680491e: am 1efe46de: Merge "Fix id3 parser crash"	Marco Nelissen	2015-01-15	1	-2/+9
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	am 1efe46de: Merge "Fix id3 parser crash"	Marco Nelissen	2015-01-15	1	-2/+9
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	Fix id3 parser crash	Marco Nelissen	2015-01-15	1	-2/+9
* \| \| \| \|	am cec272df: am 724b9ea5: Merge "Replace MidiFile player with a Midi extractor"	Marco Nelissen	2015-01-13	16	-940/+441
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 724b9ea5: Merge "Replace MidiFile player with a Midi extractor"	Marco Nelissen	2015-01-13	16	-940/+441
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	Merge "Replace MidiFile player with a Midi extractor"	Marco Nelissen	2015-01-13	16	-940/+441
\| \| \|\ \ \
\| \| \| * \| \|	Replace MidiFile player with a Midi extractor	Marco Nelissen	2015-01-08	16	-940/+441
\| * \| \| \| \|	am a2d2c48a: Merge "Don\'t signal an error at the end of a short file"	Marco Nelissen	2015-01-09	1	-19/+11
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	Merge "Don't signal an error at the end of a short file"	Marco Nelissen	2015-01-09	1	-19/+11
\| \| \|\ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| \| \| * \| \|	Don't signal an error at the end of a short file	Marco Nelissen	2014-12-23	1	-19/+11
* \| \| \| \| \|	am 26c73acb: am 0b460ad7: Merge "ACodec: Added support for E-AC3 decoders" in...	Rachad	2015-01-10	2	-0/+68
\|\ \ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| * \| \| \| \|	Merge "ACodec: Added support for E-AC3 decoders" into lmp-mr1-dev	Rachad	2015-01-10	2	-0/+68
\| \|\ \ \ \ \
\| \| * \| \| \| \|	ACodec: Added support for E-AC3 decoders	Rachad	2014-12-23	2	-0/+68
* \| \| \| \| \| \|	am d8ba6ef1: am 38a97bd7: stagefright: keep alignment restrictions for SoftVi...	Lajos Molnar	2015-01-10	1	-21/+14
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	stagefright: keep alignment restrictions for SoftVideoDecoder	Lajos Molnar	2015-01-09	1	-21/+14
* \| \| \| \| \| \|	am d18196a1: am c8c68c88: Merge "Use aligned width and height to compute size...	Ronghua Wu	2015-01-08	1	-3/+6
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	Merge "Use aligned width and height to compute size." into lmp-mr1-dev	Ronghua Wu	2015-01-08	1	-3/+6
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	Use aligned width and height to compute size.	Ronghua Wu	2015-01-07	1	-3/+6
\| \| \|/ / / / /
* \| \| \| \| \| \|	resolved conflicts for merge of 2702d5a0 to lmp-mr1-dev-plus-aosp	Marco Nelissen	2015-01-08	7	-61/+97
\|\ \ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	am c52af00b: Merge "Use callbacks for Midi I/O"	Marco Nelissen	2015-01-08	7	-61/+99
\| \|\ \ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	Use callbacks for Midi I/O	Marco Nelissen	2015-01-08	7	-61/+99
* \| \| \| \| \| \|	am e0344754: am 468977f0: Merge "mark any copyrighted content as protected to...	Chong Zhang	2015-01-08	4	-1/+18
\|\ \ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge "mark any copyrighted content as protected to disable capture" into lmp...	Chong Zhang	2015-01-08	4	-1/+18
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	mark any copyrighted content as protected to disable capture	Chong Zhang	2015-01-07	4	-1/+18
\| \| \| \|_\|/ / / \| \| \|/\| \| \| \|
* \| \| \| \| \| \|	am 9fc2f470: am 8140a2b7: stagefright: report crop rectangle as codec resolut...	Lajos Molnar	2015-01-07	1	-5/+7
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	stagefright: report crop rectangle as codec resolution if exists	Lajos Molnar	2015-01-06	1	-5/+7
* \| \| \| \| \| \|	am fb5d35c0: am 7ae3dfab: Merge "fix record from default input source" into l...	Eric Laurent	2015-01-07	1	-4/+0
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	fix record from default input source	Eric Laurent	2015-01-06	1	-4/+0
\| \|/ / / / /
* \| \| \| \| \|	am bef17542: am 5c97c4e1: Merge "Remove hardcoded ICU & OpenSSL include paths."	Narayan Kamath	2015-01-05	2	-5/+0
\|\ \ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \|
\| * \| \| \| \|	am 5c97c4e1: Merge "Remove hardcoded ICU & OpenSSL include paths."	Narayan Kamath	2015-01-05	2	-5/+0
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| \| * \| \| \|	Remove hardcoded ICU & OpenSSL include paths.	Narayan Kamath	2015-01-05	2	-5/+0
\| \| \| \|/ / \| \| \|/\| \|
* \| \| \| \|	am 69bdf92f: am 0d19abb4: Merge "NuPlayer: Do not recreate AudioTrack if not ...	Andy Hung	2014-12-29	2	-0/+39
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|