Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 3e08ca67: resolved conflicts for merge of 6571ed31 to lmp-mr1-dev-plus-aosp | Lajos Molnar | 2014-12-11 | 18 | -997/+595 |
|\ | |||||
| * | 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 |
* | | | am b6ac4d49: am 2253b3c5: am f484952e: mediaplayer: allow setVideoSurface bef... | Lajos Molnar | 2014-12-11 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | am 2253b3c5: am f484952e: mediaplayer: allow setVideoSurface before setDataSo... | Lajos Molnar | 2014-12-11 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | mediaplayer: allow setVideoSurface before setDataSource | Lajos Molnar | 2014-12-10 | 1 | -1/+1 |
| | * | Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions | Bernhard Rosenkränzer | 2014-12-09 | 2 | -3/+3 |
* | | | am 66b17e9d: Merge commit \'f5a968a0\' into mm | Glenn Kasten | 2014-12-10 | 2 | -1/+59 |
|\ \ \ | |/ / | |||||
| * | | Merge commit 'f5a968a0' into mm | Glenn Kasten | 2014-12-10 | 2 | -1/+59 |
| |\ \ | | |/ | |||||
| | * | Merge "audio policy: binder calls for dynamic audio policy mixes" into lmp-mr... | Eric Laurent | 2014-12-10 | 2 | -1/+59 |
| | |\ | |||||
| | | * | audio policy: binder calls for dynamic audio policy mixes | Eric Laurent | 2014-12-09 | 2 | -1/+59 |
* | | | | am b279f5ad: am c49d9cda: am 2dda40d6: Merge "audio policy: add support for c... | Eric Laurent | 2014-12-10 | 3 | -1/+125 |
|\ \ \ \ | |/ / / | |||||
| * | | | am c49d9cda: am 2dda40d6: Merge "audio policy: add support for custom mixes" ... | Eric Laurent | 2014-12-10 | 3 | -1/+125 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge "audio policy: add support for custom mixes" into lmp-mr1-dev | Eric Laurent | 2014-12-10 | 3 | -1/+125 |
| | |\ \ | | | |/ | |||||
| | | * | audio policy: add support for custom mixes | Eric Laurent | 2014-12-09 | 3 | -1/+125 |
* | | | | am a2bc118c: am 2a0f484e: am a04c05ab: Merge "Truncate file before recording ... | Marco Nelissen | 2014-12-10 | 1 | -0/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | am 2a0f484e: am a04c05ab: Merge "Truncate file before recording into it." | Marco Nelissen | 2014-12-10 | 1 | -0/+3 |
| |\ \ \ | |||||
| | * \ \ | Merge "Truncate file before recording into it." | Marco Nelissen | 2014-12-10 | 1 | -0/+3 |
| | |\ \ \ | |||||
| | | * | | | Truncate file before recording into it. | Marco Nelissen | 2014-12-10 | 1 | -0/+3 |
* | | | | | | am c948a971: am c15a72f6: am 1914e7ed: Merge "Fix print format mismatches." | Chih-Hung Hsieh | 2014-12-10 | 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 |
* | | | | | | Remove filename based writer constructors | Marco Nelissen | 2014-12-10 | 13 | -183/+5 |
* | | | | | | am be6a91d9: am 6eb3b520: am f6a364ed: Merge "Fix AAC recording issue" into l... | Marco Nelissen | 2014-12-09 | 1 | -1/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | 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 33cc5c91: am f143b608: am d1aeff55: Merge "Fix build with clang in C++11 m... | Lajos Molnar | 2014-12-09 | 37 | -98/+98 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am f143b608: am d1aeff55: Merge "Fix build with clang in C++11 mode" | Lajos Molnar | 2014-12-09 | 37 | -98/+98 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge "Fix build with clang in C++11 mode" | Lajos Molnar | 2014-12-09 | 37 | -98/+98 |
| | |\ \ \ \ | |||||
| | | * | | | | Fix build with clang in C++11 mode | Bernhard Rosenkränzer | 2014-11-27 | 37 | -98/+98 |
* | | | | | | | am 853bc5a2: am f3c25346: am 66172f5c: Merge "Cast int64_t values to long lon... | Lajos Molnar | 2014-12-09 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | 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 08fa30dc: am 5abc1201: am 3cc93734: Merge "Fix build with clang" | Lajos Molnar | 2014-12-09 | 1 | -2/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am 5abc1201: am 3cc93734: Merge "Fix build with clang" | Lajos Molnar | 2014-12-09 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Merge "Fix build with clang" | Lajos Molnar | 2014-12-09 | 1 | -2/+1 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Fix build with clang | Bernhard Rosenkränzer | 2014-12-08 | 1 | -2/+1 |
| | | |/ / / / / | |||||
| | * | | | | | | Merge "Prevent ANR when AudioTrack is paused or re-routed" | Glenn Kasten | 2014-12-09 | 1 | -0/+2 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Prevent ANR when AudioTrack is paused or re-routed | zunkyu.lee | 2014-12-08 | 1 | -0/+2 |
| | | | |/ / / / | | | |/| | | | | |||||
* | | | | | | | | am 80ddb730: am ce48b3a8: am f3df58c7: Merge "Stagefright: Fix unused variables" | Andreas Gampe | 2014-12-09 | 2 | -4/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | 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 9574b644: am c1b0d49c: am 82a69ea8: Prevent ANR when AudioTrack is paused ... | zunkyu.lee | 2014-12-09 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am c1b0d49c: am 82a69ea8: Prevent ANR when AudioTrack is paused or re-routed | zunkyu.lee | 2014-12-09 | 1 | -0/+2 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | Prevent ANR when AudioTrack is paused or re-routed | zunkyu.lee | 2014-12-08 | 1 | -0/+2 |
* | | | | | | | am 3ca2794e: am 0b672c8b: am ca7b4bc4: mediaplayerservice: add support for le... | Lajos Molnar | 2014-12-09 | 1 | -3/+32 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am 0b672c8b: am ca7b4bc4: mediaplayerservice: add support for legacy DRM | Lajos Molnar | 2014-12-08 | 1 | -3/+32 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | mediaplayerservice: add support for legacy DRM | Lajos Molnar | 2014-12-05 | 1 | -3/+32 |