frameworks_av.git - frameworks/av

	Commit message (Expand)	Author	Age	Files	Lines
*	am 2ba92c71: do not merge bug 3370834 Cherrypick from master	Jean-Michel Trivi	2011-01-26	3	-5/+10
\|\
\| *	do not merge bug 3370834 Cherrypick from master	Jean-Michel Trivi	2011-01-26	3	-5/+10
* \|	am 239fd805: Merge "fix [3361121] hang in glClear() - device unresponsive, OT...	Mathias Agopian	2011-01-25	1	-7/+1
\|\ \ \| \|/
\| *	fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)	Mathias Agopian	2011-01-25	1	-7/+1
* \|	merge 83fdc69e from gingerbread - do not merge	Jean-Baptiste Queru	2011-01-14	3	-62/+10
\|\ \ \| \|/
\| *	Squash commits of the following patches, cherry-picked from other branch - do...	James Dong	2011-01-12	3	-62/+10
* \|	am 13d1cb56: Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecOb...	James Dong	2011-01-10	1	-2/+7
\|\ \ \| \|/
\| *	Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold...	James Dong	2011-01-10	1	-2/+7
* \|	am 0544d059: Merge "DRM Framework bug fixes."	Gloria Wang	2011-01-07	1	-0/+3
\|\ \
\| * \	Merge "DRM Framework bug fixes."	Gloria Wang	2011-01-07	1	-0/+3
\| \|\ \
\| \| * \|	DRM Framework bug fixes.	Takeshi Aimi	2010-11-30	1	-0/+3
* \| \| \|	am ba77a3f9: Add support for the "compilation" tag in mp3, mp4 and ogg, and a...	Marco Nelissen	2011-01-06	2	-0/+2
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	Add support for the "compilation" tag in mp3, mp4 and ogg, and also add	Marco Nelissen	2011-01-06	2	-0/+2
* \| \| \|	am 35e8dcb9: Merge "Suppress the recording sound in the recorded video" into ...	James Dong	2011-01-05	1	-2/+2
\|\ \ \ \ \| \|/ / / \| \| / / \| \|/ / \|/\| \|
\| * \|	Suppress the recording sound in the recorded video	James Dong	2011-01-04	1	-2/+2
* \| \|	am d9334934: Merge "Update of DRM Framework."	Gloria Wang	2010-11-22	2	-0/+123
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Update of DRM Framework.	Takeshi Aimi	2010-11-19	2	-0/+123
* \| \|	am 589e8381: Merge "Improve camera documentation." into gingerbread	Wu-cheng Li	2010-11-19	3	-17/+28
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Improve camera documentation.	Wu-cheng Li	2010-11-19	3	-17/+28
* \| \|	am d2d62d04: Merge "Support extracting thumbnail from rotated video tracks" i...	James Dong	2010-11-08	1	-0/+1
\|\ \ \ \| \|/ /
\| * \|	Support extracting thumbnail from rotated video tracks	James Dong	2010-11-08	1	-0/+1
* \| \|	resolved conflicts for merge of 31dc911a to gingerbread-plus-aosp	Andreas Huber	2010-11-08	3	-3/+15
\|\ \ \ \| \|/ /
\| * \|	Support post-decode video rotation.	Andreas Huber	2010-11-05	3	-3/+15
* \| \|	am 1653e261: Merge "Rotation support" into gingerbread	James Dong	2010-11-06	2	-0/+2
\|\ \ \ \| \|/ /
\| * \|	Rotation support	James Dong	2010-11-05	2	-0/+2
* \| \|	am f3847e87: Merge "DO NOT MERGE" into gingerbread	James Dong	2010-11-03	1	-0/+1
\|\ \ \ \| \|/ /
\| * \|	DO NOT MERGE	James Dong	2010-11-02	1	-0/+1
* \| \|	am ef8a810b: Merge "Update of DRM framework"	Gloria Wang	2010-11-02	3	-23/+16
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Update of DRM framework	Takeshi Aimi	2010-11-02	3	-23/+16
* \| \|	resolved conflicts for merge of 9084631d to gingerbread-plus-aosp	Gloria Wang	2010-10-25	5	-0/+33
\|\ \ \ \| \|/ /
\| * \|	DRM framework support:	Gloria Wang	2010-10-25	5	-0/+33
* \| \|	am 0c636055: Merge "Mirror the preview for front-facing cameras. do not merge...	Mathias Agopian	2010-10-21	1	-0/+12
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Merge "Mirror the preview for front-facing cameras. do not merge" into ginger...	Mathias Agopian	2010-10-21	1	-0/+12
\| \|\ \
\| \| * \|	Mirror the preview for front-facing cameras. do not merge	Wu-cheng Li	2010-10-20	1	-0/+12
* \| \| \|	am fa7a87fb: Merge "File writer size estimation improvement" into gingerbread	James Dong	2010-10-20	1	-0/+1
\|\ \ \ \ \| \|/ / /
\| * \| \|	File writer size estimation improvement	James Dong	2010-10-19	1	-0/+1
\| \|/ /
* \| \|	am bc96c284: Merge "For thumbnail extraction make sure we instantiate a decod...	Andreas Huber	2010-10-18	1	-1/+5
\|\ \ \ \| \|/ /
\| * \|	For thumbnail extraction make sure we instantiate a decoder that allows acces...	Andreas Huber	2010-10-18	1	-1/+5
* \| \|	am ff7a7a45: Merge "Check-in of a copy of the Khronos OpenMAX headers formerl...	Andreas Huber	2010-10-15	10	-0/+6937
\|\ \ \ \| \|/ /
\| * \|	Check-in of a copy of the Khronos OpenMAX headers formerly included from exte...	Andreas Huber	2010-10-15	10	-0/+6937
* \| \|	am 312644cd: Merge "Support for writing to MPEG2 transport stream files." int...	Andreas Huber	2010-10-13	2	-0/+8
\|\ \ \ \| \|/ /
\| * \|	Merge "Support for writing to MPEG2 transport stream files." into gingerbread	Andreas Huber	2010-10-13	2	-0/+8
\| \|\ \
\| \| * \|	Support for writing to MPEG2 transport stream files.	Andreas Huber	2010-10-12	2	-0/+8
* \| \| \|	am 165c6579: Merge "HTTP Live content that are tagged as complete are now see...	Andreas Huber	2010-10-13	1	-0/+1
\|\ \ \ \ \| \|/ / /
\| * \| \|	HTTP Live content that are tagged as complete are now seekable.	Andreas Huber	2010-10-12	1	-0/+1
\| \|/ /
* \| \|	am f72dd019: Merge "Disable 10secs forward/backward seeking for rtsp as seek ...	Andreas Huber	2010-10-08	2	-3/+5
\|\ \ \ \| \|/ /
\| * \|	Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very exp...	Andreas Huber	2010-10-08	2	-3/+5
\| \|\ \
\| \| * \|	Disable 10secs forward/backward seeking for rtsp as seek is a very expensive ...	Andreas Huber	2010-10-08	2	-3/+5
* \| \| \|	am b37fcbfd: Merge "Added getter for session Id to AudioSink" into gingerbread	Eric Laurent	2010-10-08	1	-0/+1
\|\ \ \ \ \| \|/ / /
\| * \| \|	Added getter for session Id to AudioSink	Eric Laurent	2010-10-07	1	-0/+1
\| \|/ /