frameworks_av.git - frameworks/av

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for 0b09da7a to lmp-mr1-dev	Wei Jia	2015-10-08	5	-0/+19
\|\
\| *	am 04c02eeb: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely c...	Wei Jia	2015-10-08	5	-3/+22
\| \|\
\| \| *	Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateB...	Wei Jia	2015-10-08	5	-3/+22
\| \| \|\
\| \| \| *	DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.	Wei Jia	2015-10-07	5	-3/+22
* \| \| \|	am 8b713f11: am b75a78db: am fc0e2a87: am 7ed8d1ef: ID3: check possible integ...	Wei Jia	2015-10-06	1	-2/+19
\|\ \ \ \ \| \|/ / /
\| * \| \|	am b75a78db: am fc0e2a87: am 7ed8d1ef: ID3: check possible integer overflow f...	Wei Jia	2015-10-06	1	-2/+19
\| \|\ \ \ \| \| \|/ /
\| \| * \|	am fc0e2a87: am 7ed8d1ef: ID3: check possible integer overflow for extendedHe...	Wei Jia	2015-10-06	1	-2/+19
\| \| \|\ \ \| \| \| \|/ \| \| \|/\|
\| \| \| *	am 7ed8d1ef: ID3: check possible integer overflow for extendedHeaderSize and ...	Wei Jia	2015-10-06	1	-2/+19
\| \| \| \|\
\| \| \| \| *	ID3: check possible integer overflow for extendedHeaderSize and paddingSize.	Wei Jia	2015-10-06	1	-2/+19
* \| \| \| \|	am f2cf2bd7: am 07395f4c: am 00f5fa82: am 74d1927e: Merge "Check NAL size bef...	Marco Nelissen	2015-10-06	1	-2/+9
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	am 07395f4c: am 00f5fa82: am 74d1927e: Merge "Check NAL size before use" into...	Marco Nelissen	2015-10-06	1	-2/+9
\| \|\ \ \ \ \| \| \|/ / /
\| \| * \| \|	am 00f5fa82: am 74d1927e: Merge "Check NAL size before use" into klp-dev	Marco Nelissen	2015-10-06	1	-2/+9
\| \| \|\ \ \ \| \| \| \|/ /
\| \| \| * \|	am 74d1927e: Merge "Check NAL size before use" into klp-dev	Marco Nelissen	2015-10-06	1	-2/+9
\| \| \| \|\ \ \| \| \| \| \|/
\| \| \| \| *	Merge "Check NAL size before use" into klp-dev	Marco Nelissen	2015-10-06	1	-2/+9
\| \| \| \| \|\
\| \| \| \| \| *	Check NAL size before use	Marco Nelissen	2015-10-06	1	-2/+9
* \| \| \| \| \|	am 62d89908: am df68d9d5: am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: en...	Wei Jia	2015-10-06	1	-0/+6
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am df68d9d5: am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer s...	Wei Jia	2015-10-06	1	-0/+6
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not le...	Wei Jia	2015-10-06	1	-0/+6
\| \| \|\ \ \ \ \| \| \| \|/ / /
\| \| \| * \| \|	am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not less than 8 for...	Wei Jia	2015-10-06	1	-0/+6
\| \| \| \|\ \ \ \| \| \| \| \|/ /
\| \| \| \| * \|	Merge "MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentD...	Wei Jia	2015-10-06	1	-0/+6
\| \| \| \| \|\ \
\| \| \| \| \| * \|	MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.	Wei Jia	2015-10-06	1	-0/+6
\| \| \| \| \| \|/
* \| \| \| \| \|	am 7ce82583: am 13b6b51e: am f7d1f627: am 257b3bc5: Don\'t crash when there\'...	Marco Nelissen	2015-10-06	1	-0/+5
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am 13b6b51e: am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal ...	Marco Nelissen	2015-10-06	1	-0/+5
\| \|\ \ \ \ \ \| \| \|/ / / /
\| \| * \| \| \|	am f7d1f627: am 257b3bc5: Don\'t crash when there\'s no conceal frame	Marco Nelissen	2015-10-06	1	-0/+5
\| \| \|\ \ \ \ \| \| \| \|/ / /
\| \| \| * \| \|	am 257b3bc5: Don\'t crash when there\'s no conceal frame	Marco Nelissen	2015-10-06	1	-0/+5
\| \| \| \|\ \ \ \| \| \| \| \|/ /
\| \| \| \| * \|	Don't crash when there's no conceal frame	Marco Nelissen	2015-10-05	1	-0/+5
\| \| \| \| \|/
\| \| \| * \|	am 3737a3fa: DO NOT MERGE stagefright: fix AMessage::FromParcel	Flanker	2015-09-29	1	-3/+22
\| \| \| \|\ \ \| \| \| \| \|/
\| \| \| \| *	DO NOT MERGE stagefright: fix AMessage::FromParcel	Flanker	2015-09-25	1	-3/+22
\| \| \| * \|	am 6272fa1b: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into klp-dev	Jeff Tinker	2015-09-17	1	-0/+2
\| \| \| \|\ \ \| \| \| \| \|/
\| \| \| \| *	Merge "DO NOT MERGE Fix vulnerability in mediaserver" into klp-dev	Jeff Tinker	2015-09-17	1	-0/+2
\| \| \| \| \|\
\| \| \| \| \| *	DO NOT MERGE Fix vulnerability in mediaserver	Jeff Tinker	2015-09-16	1	-0/+2
\| \| \| * \| \|	am f43125ed: Merge "Fix for security vulnerability in media server DO NOT MER...	Jeff Tinker	2015-09-17	1	-1/+23
\| \| \| \|\ \ \ \| \| \| \| \|/ /
\| \| \| \| * \|	Merge "Fix for security vulnerability in media server DO NOT MERGE" into klp-dev	Jeff Tinker	2015-09-17	1	-1/+23
\| \| \| \| \|\ \
\| \| \| \| \| * \|	Fix for security vulnerability in media server DO NOT MERGE	Jeff Tinker	2015-09-14	1	-1/+23
\| \| \| \| \| \|/
\| \| \| * \| \|	am ae922517: Merge "DO NOT MERGE - IAudioFlinger: always initialize variables...	Wei Jia	2015-09-17	1	-10/+10
\| \| \| \|\ \ \ \| \| \| \| \|/ /
\| \| \| \| * \|	DO NOT MERGE - IAudioFlinger: always initialize variables to ensure no info l...	Wei Jia	2015-09-16	1	-10/+10
\| \| \| * \| \|	am b21a6420: Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous earl...	Wonsik Kim	2015-09-16	4	-7/+21
\| \| \| \|\ \ \ \| \| \| \| \|/ /
\| \| \| \| * \|	Merge "DO NOT MERGE NuCachedSource2: fix possible erroneous early free" into ...	Wonsik Kim	2015-09-16	4	-7/+21
\| \| \| \| \|\ \
\| \| \| \| \| * \|	DO NOT MERGE NuCachedSource2: fix possible erroneous early free	Wonsik Kim	2015-09-14	4	-7/+21
\| \| \| * \| \| \|	am 741a3351: Merge "DO NOT MERGE - IAudioFlinger: clear config before reading...	Wei Jia	2015-09-11	1	-2/+4
\| \| \| \|\ \ \ \ \| \| \| \| \|/ / /
\| \| \| \| * \| \|	Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parc...	Wei Jia	2015-09-11	1	-2/+4
\| \| \| \| \|\ \ \
\| \| \| \| \| * \| \|	DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.	Wei Jia	2015-09-10	1	-2/+4
\| \| \| \| \| \|/ /
\| \| \| * \| \| \|	am b659b4c7: Merge "DO NOT MERGE fix build" into klp-dev	Wonsik Kim	2015-09-11	1	-0/+1
\| \| \| \|\ \ \ \ \| \| \| \| \|/ / /
\| \| \| \| * \| \|	Merge "DO NOT MERGE fix build" into klp-dev	Wonsik Kim	2015-09-11	1	-0/+1
\| \| \| \| \|\ \ \
\| \| \| \| \| * \| \|	DO NOT MERGE fix build	Wonsik Kim	2015-09-11	1	-0/+1
\| \| \| * \| \| \| \|	am 1784a8db: Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding onc...	Wonsik Kim	2015-09-11	2	-94/+21
\| \| \| \|\ \ \ \ \ \| \| \| \| \|/ / / /
\| \| \| \| * \| \| \|	Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into...	Wonsik Kim	2015-09-11	2	-94/+21
\| \| \| \| \|\ \ \ \ \| \| \| \| \| \|/ / / \| \| \| \| \| \| / / \| \| \| \| \| \|/ / \| \| \| \| \|/\| \|
\| \| \| \| \| * \|	DO NOT MERGE Avoid size_t overflow in base64 decoding once again	Wonsik Kim	2015-09-09	2	-94/+21
\| \| \| \| \| \|/
* \| \| \| \| \|	am e64d4870: am 2b8cd9cb: stagefright: fix AMessage::FromParcel	Flanker	2015-09-29	1	-3/+25
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	am 2b8cd9cb: stagefright: fix AMessage::FromParcel	Flanker	2015-09-29	1	-3/+25
\| \|\ \ \ \ \ \| \| \|/ / / /