frameworks_av.git - frameworks/av

	Commit message (Expand)	Author	Age	Files	Lines
*	resolved conflicts for merge of 6571ed31 to lmp-mr1-dev-plus-aosp	Lajos Molnar	2014-12-11	18	-997/+595
\|\
\| *	stagefright: misc fixes to software video encoders (and decoders)	Lajos Molnar	2014-12-10	18	-997/+594
\| *	Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions	Bernhard Rosenkränzer	2014-12-09	2	-3/+3
* \|	am c15a72f6: am 1914e7ed: Merge "Fix print format mismatches."	Chih-Hung Hsieh	2014-12-10	2	-3/+3
\|\ \
\| * \|	Fix print format mismatches.	Chih-Hung Hsieh	2014-12-09	2	-3/+3
* \| \|	am 6eb3b520: am f6a364ed: Merge "Fix AAC recording issue" into lmp-mr1-dev	Marco Nelissen	2014-12-09	1	-1/+2
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Merge "Fix AAC recording issue" into lmp-mr1-dev	Marco Nelissen	2014-12-09	1	-1/+2
\| \|\ \
\| \| * \|	Fix AAC recording issue	Marco Nelissen	2014-12-09	1	-1/+2
* \| \| \|	am f143b608: am d1aeff55: Merge "Fix build with clang in C++11 mode"	Lajos Molnar	2014-12-09	36	-97/+97
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	Merge "Fix build with clang in C++11 mode"	Lajos Molnar	2014-12-09	36	-97/+97
\| \|\ \ \
\| \| * \| \|	Fix build with clang in C++11 mode	Bernhard Rosenkränzer	2014-11-27	36	-97/+97
* \| \| \| \|	am f3c25346: am 66172f5c: Merge "Cast int64_t values to long long before print."	Lajos Molnar	2014-12-09	1	-2/+2
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge "Cast int64_t values to long long before print."	Lajos Molnar	2014-12-09	1	-2/+2
\| \|\ \ \ \
\| \| * \| \| \|	Cast int64_t values to long long before print.	Bernhard Rosenkränzer	2014-12-04	1	-2/+2
* \| \| \| \| \|	am ce48b3a8: am f3df58c7: Merge "Stagefright: Fix unused variables"	Andreas Gampe	2014-12-09	2	-4/+1
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Stagefright: Fix unused variables	Andreas Gampe	2014-12-04	2	-4/+1
\| \|/ / / /
* \| \| \| \|	am 6874ed79: am a9d2f9fb: Merge "stagefright: preserve output format flags on...	Lajos Molnar	2014-12-08	1	-2/+5
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	stagefright: preserve output format flags on format change	Lajos Molnar	2014-12-05	1	-2/+5
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	am 25bad49c: am 852dc963: Merge "avc_util: try to find the first start code p...	Wei Jia	2014-12-08	2	-17/+15
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "avc_util: try to find the first start code prefix 0x000001 even though...	Wei Jia	2014-12-05	2	-17/+15
\| \|\ \ \
\| \| * \| \|	avc_util: try to find the first start code prefix 0x000001 even though there ...	Wei Jia	2014-12-04	2	-17/+15
* \| \| \| \|	am 7f099ffd: am 8790740d: media_codecs.xml: extend vorbis sample rate to 8-96kHz	Lajos Molnar	2014-12-08	1	-1/+1
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	media_codecs.xml: extend vorbis sample rate to 8-96kHz	Lajos Molnar	2014-12-04	1	-1/+1
\| \|/ / /
* \| \| \|	am 848b4c67: am 814cbb4e: Merge "ESQueue: add frame length checking in valida...	Wei Jia	2014-12-05	1	-4/+19
\|\ \ \ \ \| \|/ / /
\| * \| \|	ESQueue: add frame length checking in validation of ADTS header.	Wei Jia	2014-12-03	1	-4/+19
* \| \| \|	am 93f5b333: am 050ff19e: Merge "libstagefright: defer kWhatSetParameters in ...	Lajos Molnar	2014-12-04	1	-0/+1
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Merge "libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedS...	Lajos Molnar	2014-12-04	1	-0/+1
\| \|\ \ \
\| \| * \| \|	libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedState	Per Persson	2014-12-04	1	-0/+1
* \| \| \| \|	am 42495ddc: am 592f3bc8: Merge "Added support for YEAR metadata key from Vor...	Glenn Kasten	2014-12-01	1	-0/+1
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge "Added support for YEAR metadata key from VorbisComments"	Glenn Kasten	2014-12-01	1	-0/+1
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|
\| \| * \| \|	Added support for YEAR metadata key from VorbisComments	Andreas Lillvik	2014-11-11	1	-0/+1
\| \| \|/ /
* \| \| \|	resolved conflicts for merge of e5ba80c5 to lmp-mr1-dev-plus-aosp	Andreas Gampe	2014-11-27	42	-237/+95
\|\ \ \ \ \| \|/ / /
\| * \| \|	Merge "Stagefright: Fix unused variables, functions, values"	Andreas Gampe	2014-11-26	43	-241/+95
\| \|\ \ \
\| \| * \| \|	Stagefright: Fix unused variables, functions, values	Andreas Gampe	2014-11-25	43	-241/+95
* \| \| \| \|	am 9574c274: am 5d2c5fcb: Merge "MediaCodec: resume codec if state is FLUSHED...	Chong Zhang	2014-11-26	1	-0/+2
\|\ \ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	Merge "MediaCodec: resume codec if state is FLUSHED in async mode" into lmp-m...	Chong Zhang	2014-11-26	1	-0/+2
\| \|\ \ \ \
\| \| * \| \| \|	MediaCodec: resume codec if state is FLUSHED in async mode	Chong Zhang	2014-11-26	1	-0/+2
* \| \| \| \| \|	am 20918be9: am b2cf160f: Merge "stagefright: add graceful handling when sett...	Lajos Molnar	2014-11-26	1	-12/+12
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	stagefright: add graceful handling when setting port definition	Lajos Molnar	2014-11-25	1	-12/+12
\| \|/ / / /
* \| \| \| \|	am e464018a: am f59eae94: Merge "Fix overload of SoftVideoDecoderOMXComponent...	Chih-hung Hsieh	2014-11-25	2	-3/+3
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	Merge "Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions"	Chih-hung Hsieh	2014-11-25	2	-3/+3
\| \|\ \ \ \
\| \| * \| \| \|	Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions	Bernhard Rosenkränzer	2014-11-20	2	-3/+3
* \| \| \| \| \|	am 7fca411f: am b44760cf: Merge "Remove deprecated register keyword"	Chih-hung Hsieh	2014-11-25	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Remove deprecated register keyword	Bernhard Rosenkränzer	2014-11-25	1	-1/+1
* \| \| \| \| \|	am 112ba592: am 6c7d332f: Merge "Remove bogus forward declarations"	Chih-hung Hsieh	2014-11-25	2	-4/+0
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge "Remove bogus forward declarations"	Chih-hung Hsieh	2014-11-24	2	-4/+0
\| \|\ \ \ \ \ \| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| \| * \| \| \|	Remove bogus forward declarations	Bernhard Rosenkränzer	2014-11-20	2	-4/+0
\| \| \|/ / /
* \| \| \| \|	am 865449b4: am e4f6ecb9: Merge "Stagefright: Fix default typo"	Andreas Gampe	2014-11-25	1	-2/+2
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Stagefright: Fix default typo	Andreas Gampe	2014-11-24	1	-2/+2
* \| \| \| \|	am 128b7850: am db1ce33e: Merge "Remove check for an impossible condition"	Chih-hung Hsieh	2014-11-25	1	-4/+0
\|\ \ \ \ \ \| \|/ / / /