Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am f143b608: am d1aeff55: Merge "Fix build with clang in C++11 mode" | Lajos Molnar | 2014-12-09 | 35 | -95/+95 |
|\ | |||||
| * | Merge "Fix build with clang in C++11 mode" | Lajos Molnar | 2014-12-09 | 35 | -95/+95 |
| |\ | |||||
| | * | Fix build with clang in C++11 mode | Bernhard Rosenkränzer | 2014-11-27 | 35 | -95/+95 |
* | | | 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 |
| |/ | |||||
* | | resolved conflicts for merge of e5ba80c5 to lmp-mr1-dev-plus-aosp | Andreas Gampe | 2014-11-27 | 23 | -113/+24 |
|\ \ | |/ | |||||
| * | Merge "Stagefright: Fix unused variables, functions, values" | Andreas Gampe | 2014-11-26 | 23 | -116/+24 |
| |\ | |||||
| | * | Stagefright: Fix unused variables, functions, values | Andreas Gampe | 2014-11-25 | 23 | -116/+24 |
* | | | 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 128b7850: am db1ce33e: Merge "Remove check for an impossible condition" | Chih-hung Hsieh | 2014-11-25 | 1 | -4/+0 |
|\ \ \ | |/ / | |||||
| * | | Merge "Remove check for an impossible condition" | Chih-hung Hsieh | 2014-11-24 | 1 | -4/+0 |
| |\ \ | |||||
| | * | | Remove check for an impossible condition | Bernhard Rosenkraenzer | 2014-10-04 | 1 | -4/+0 |
* | | | | am d6048672: am 9d2e0dae: Merge "Remove extraneous parentheses" | Chih-hung Hsieh | 2014-11-20 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Remove extraneous parentheses | Bernhard Rosenkränzer | 2014-11-20 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | am 5f3eef9a: am 7a200235: Merge "Remove extraneous parentheses" | Chih-hung Hsieh | 2014-11-18 | 2 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Remove extraneous parentheses | Bernhard Rosenkränzer | 2014-11-18 | 2 | -2/+2 |
* | | | am eb0827f3: am c5160b34: Merge "Remove the executable bit from source files" | Glenn Kasten | 2014-11-10 | 91 | -0/+0 |
|\ \ \ | |/ / | |||||
| * | | Remove the executable bit from source files | Martin Storsjo | 2014-11-07 | 91 | -0/+0 |
| * | | am 8a8f2fdc: am 589a89f5: Merge "Add -no-integrated-as at local level." | Chih-Hung Hsieh | 2014-10-16 | 1 | -0/+2 |
| |\ \ | |||||
| * \ \ | resolved conflicts for merge of 2edda09a to lmp-dev-plus-aosp | Lajos Molnar | 2014-10-14 | 7 | -362/+70 |
| |\ \ \ | |||||
| * \ \ \ | am 801a3ff8: Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat... | Chong Zhang | 2014-10-13 | 1 | -1/+8 |
| |\ \ \ \ | |||||
| * \ \ \ \ | am 5002d02e: Merge "Recover from errors" into lmp-dev | Marco Nelissen | 2014-10-07 | 1 | -5/+14 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | am 566a6fba: am ae38d425: Merge "Add -no-integrated-as at local level." | Chih-Hung Hsieh | 2014-10-06 | 1 | -0/+3 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | am b220fe0e: Merge "stagefright: fix fake-stride handling for H263 SW decoder... | Ronghua Wu | 2014-10-03 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | am d0b9efe7: Merge "add AAC audio decoder params for PCM limiter enable" into... | Chong Zhang | 2014-10-01 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | am ea55da94: Merge "Fix SoftAAC2 flush" into lmp-dev | Marco Nelissen | 2014-09-25 | 1 | -4/+8 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | am cae1c0fa: Merge "stagefright: fix cropping handling for SoftAVC and SoftME... | Ronghua Wu | 2014-09-25 | 3 | -15/+21 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | am 80ec934a: Merge "stagefright: add adaptive playback support to SoftHEVC de... | Ronghua Wu | 2014-09-24 | 2 | -80/+125 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | am 4409ba46: Merge "Fix ringbuffer handling" into lmp-dev | Marco Nelissen | 2014-09-19 | 2 | -24/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | am b0ed4e3e: Merge "Always consider first buffer to be config" into lmp-dev | Marco Nelissen | 2014-09-19 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | am 999b888f: Merge "Fix null pointer dereference" into lmp-dev | Marco Nelissen | 2014-09-17 | 1 | -2/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "libstagefright: set actual stride info for SW encoder input port" into... | Lajos Molnar | 2014-10-28 | 3 | -0/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | libstagefright: set actual stride info for SW encoder input port | Lajos Molnar | 2014-10-25 | 3 | -0/+12 |
* | | | | | | | | | | | | | | | | | am fd460a1f: am 097fc64d: Merge "Don\'t signal an error at the end of a short... | Marco Nelissen | 2014-10-21 | 1 | -21/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | Don't signal an error at the end of a short file | Marco Nelissen | 2014-10-16 | 1 | -21/+10 |
* | | | | | | | | | | | | | | | | | am 8a8f2fdc: am 589a89f5: Merge "Add -no-integrated-as at local level." | Chih-Hung Hsieh | 2014-10-16 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Add -no-integrated-as at local level. | Chih-Hung Hsieh | 2014-10-16 | 1 | -0/+2 |
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | resolved conflicts for merge of f4147ee9 to lmp-mr1-dev-plus-aosp | Lajos Molnar | 2014-10-14 | 7 | -362/+70 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | am 48be19a4: am 2edda09a: stagefright: fix surface input handling of software... | Lajos Molnar | 2014-10-14 | 7 | -349/+72 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | stagefright: fix surface input handling of software encoders | Lajos Molnar | 2014-10-13 | 7 | -349/+72 |
| | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | |