Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 6a0fbc68: am a3c9d5c3: am 166776fb: Merge "Add missing includes." | Elliott Hughes | 2015-01-29 | 3 | -0/+3 |
|\ | |||||
| * | am a3c9d5c3: am 166776fb: Merge "Add missing includes." | Elliott Hughes | 2015-01-29 | 3 | -0/+3 |
| |\ | |||||
| | * | am 166776fb: Merge "Add missing includes." | Elliott Hughes | 2015-01-29 | 3 | -0/+3 |
| | |\ | |||||
| | | * | Merge "Add missing includes." | Elliott Hughes | 2015-01-29 | 3 | -0/+3 |
| | | |\ | |||||
| | | | * | Add missing includes. | Elliott Hughes | 2015-01-28 | 3 | -0/+3 |
* | | | | | am 2588b453: am 29e609a8: am 628d4ea1: Merge "stagefright: do not reject SPL5... | Ronghua Wu | 2015-01-29 | 1 | -2/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am 29e609a8: am 628d4ea1: Merge "stagefright: do not reject SPL5 files outrig... | Ronghua Wu | 2015-01-28 | 1 | -2/+2 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge "stagefright: do not reject SPL5 files outright in SoftMpeg4 decoder" i... | Ronghua Wu | 2015-01-28 | 1 | -2/+2 |
| | |\ \ \ \ | |||||
| | | * | | | | stagefright: do not reject SPL5 files outright in SoftMpeg4 decoder | Ronghua Wu | 2015-01-28 | 1 | -2/+2 |
* | | | | | | | am 0566949e: am ba553472: am aeccbffd: Merge "Avoid mixing declarations and s... | Andreas Gampe | 2015-01-28 | 1 | -2/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am ba553472: am aeccbffd: Merge "Avoid mixing declarations and statements in ... | Andreas Gampe | 2015-01-28 | 1 | -2/+1 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | am aeccbffd: Merge "Avoid mixing declarations and statements in C89 source fi... | Andreas Gampe | 2015-01-28 | 1 | -2/+1 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| | | * | | | | Merge "Avoid mixing declarations and statements in C89 source files" | Andreas Gampe | 2015-01-28 | 1 | -2/+1 |
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | | | * | | | Avoid mixing declarations and statements in C89 source files | Martin Storsjo | 2014-12-30 | 1 | -2/+1 |
* | | | | | | | am 5fcd4d19: am 0bd5274e: am 231406d5: NuPlayerRenderer: return current real ... | Wei Jia | 2015-01-28 | 2 | -15/+18 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am 0bd5274e: am 231406d5: NuPlayerRenderer: return current real time as rende... | Wei Jia | 2015-01-28 | 2 | -15/+18 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | NuPlayerRenderer: return current real time as render time for video frame whe... | Wei Jia | 2015-01-27 | 2 | -15/+18 |
| | | |_|_|/ | | |/| | | | |||||
* | | | | | | am 88d74d20: Add missing AudioPolicy.cpp to Android.mk | Brian Carlstrom | 2015-01-27 | 1 | -1/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Add missing AudioPolicy.cpp to Android.mk | Brian Carlstrom | 2015-01-27 | 1 | -1/+2 |
* | | | | | | resolved conflicts for merge of 9391844d to master | Marco Nelissen | 2015-01-27 | 10 | -1662/+4 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | resolved conflicts for merge of b955b722 to lmp-mr1-dev-plus-aosp | Marco Nelissen | 2015-01-27 | 10 | -1661/+4 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | am 47deb15e: Merge "Remove MediaPlayerService::decode()" | Marco Nelissen | 2015-01-27 | 10 | -1656/+13 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | Merge "Remove MediaPlayerService::decode()" | Marco Nelissen | 2015-01-27 | 10 | -1656/+13 |
| | | |\ \ \ | |||||
| | | | * | | | Remove MediaPlayerService::decode() | Marco Nelissen | 2015-01-26 | 10 | -1656/+13 |
* | | | | | | | am b7909adc: am 64b08d23: am cbb803a5: Merge "Remove superfluous OpenSSL incl... | Kenny Root | 2015-01-26 | 3 | -5/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am 64b08d23: am cbb803a5: Merge "Remove superfluous OpenSSL include paths." | Kenny Root | 2015-01-26 | 3 | -5/+4 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | am cbb803a5: Merge "Remove superfluous OpenSSL include paths." | Kenny Root | 2015-01-26 | 3 | -5/+4 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Remove superfluous OpenSSL include paths. | Adam Langley | 2015-01-22 | 3 | -5/+4 |
| | | |/ / / | |||||
* | | | | | | am d35c2120: am 1f7101ee: am 64c496c8: Merge "Fix MTP delete" into lmp-mr1-dev | Marco Nelissen | 2015-01-23 | 1 | -2/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am 1f7101ee: am 64c496c8: Merge "Fix MTP delete" into lmp-mr1-dev | Marco Nelissen | 2015-01-23 | 1 | -2/+2 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge "Fix MTP delete" into lmp-mr1-dev | Marco Nelissen | 2015-01-23 | 1 | -2/+2 |
| | |\ \ \ \ | |||||
| | | * | | | | Fix MTP delete | Marco Nelissen | 2015-01-23 | 1 | -2/+2 |
* | | | | | | | am 882ffba6: am d8aff827: am ddc1216d: Merge "MPEG4Extractor: more NULL deref... | Robert Shih | 2015-01-23 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am d8aff827: am ddc1216d: Merge "MPEG4Extractor: more NULL derefernce fixes i... | Robert Shih | 2015-01-23 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge "MPEG4Extractor: more NULL derefernce fixes in parseChunk" into lmp-mr1... | Robert Shih | 2015-01-23 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | | * | | | | MPEG4Extractor: more NULL derefernce fixes in parseChunk | Robert Shih | 2015-01-21 | 1 | -1/+1 |
* | | | | | | | am 40a0ac3a: am 0fe24de8: am c0c2366c: Merge "stagefright: do not reject SPL4... | Ronghua Wu | 2015-01-23 | 1 | -0/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am 0fe24de8: am c0c2366c: Merge "stagefright: do not reject SPL4 files outrig... | Ronghua Wu | 2015-01-23 | 1 | -0/+4 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge "stagefright: do not reject SPL4 files outright in SoftMpeg4 decoder" i... | Ronghua Wu | 2015-01-23 | 1 | -0/+4 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | stagefright: do not reject SPL4 files outright in SoftMpeg4 decoder | Ronghua Wu | 2015-01-22 | 1 | -0/+4 |
| | | |/ / / / | |||||
* | | | | | | | am d9e8b820: am b3e1f71b: am 841d22b0: libstagefright: Use aligned width and ... | Ronghua Wu | 2015-01-23 | 1 | -2/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am b3e1f71b: am 841d22b0: libstagefright: Use aligned width and height. | Ronghua Wu | 2015-01-23 | 1 | -2/+4 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | libstagefright: Use aligned width and height. | Ronghua Wu | 2015-01-22 | 1 | -2/+4 |
| | |/ / / / | |||||
* | | | | | | am 4beddcf5: am 9e308de9: am 4d4ea7f7: Merge "do not use paused postition if ... | Chong Zhang | 2015-01-16 | 1 | -2/+8 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | am 9e308de9: am 4d4ea7f7: Merge "do not use paused postition if it\'s not ava... | Chong Zhang | 2015-01-16 | 1 | -2/+8 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge "do not use paused postition if it's not available" into lmp-mr1-dev | Chong Zhang | 2015-01-16 | 1 | -2/+8 |
| | |\ \ \ \ | |||||
| | | * | | | | do not use paused postition if it's not available | Chong Zhang | 2015-01-15 | 1 | -2/+8 |
| | * | | | | | MidiFile: report correct state during transient period when start() is called... | Wei Jia | 2015-01-14 | 1 | -1/+1 |
| * | | | | | | am e680491e: am 1efe46de: Merge "Fix id3 parser crash" | Marco Nelissen | 2015-01-15 | 1 | -2/+9 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | am 1efe46de: Merge "Fix id3 parser crash" | Marco Nelissen | 2015-01-15 | 1 | -2/+9 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | |