summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | am 79971c74: httplive: Dont resume if we have almost fetched till stop timeApurupa Pattapu2015-01-292-3/+10
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | httplive: Dont resume if we have almost fetched till stop timeApurupa Pattapu2015-01-282-3/+10
* | | | | | | am 3606efd1: am 9dee2e59: stagefright: httplive: Propagate target duration to...Leena Winterrowd2015-01-291-0/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 9dee2e59: stagefright: httplive: Propagate target duration to LiveSessionLeena Winterrowd2015-01-291-0/+5
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | stagefright: httplive: Propagate target duration to LiveSessionLeena Winterrowd2015-01-281-0/+5
* | | | | | | am b2f95a1f: am 2a66207f: httplive: Create a copy of last enqueued metadataApurupa Pattapu2015-01-291-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 2a66207f: httplive: Create a copy of last enqueued metadataApurupa Pattapu2015-01-291-2/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | httplive: Create a copy of last enqueued metadataApurupa Pattapu2015-01-281-2/+2
* | | | | | | am 958a5432: am 17460976: stagefright: httplive: Fix deadlock for low duratio...Leena Winterrowd2015-01-292-2/+17
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 17460976: stagefright: httplive: Fix deadlock for low duration clipsLeena Winterrowd2015-01-292-2/+17
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | stagefright: httplive: Fix deadlock for low duration clipsLeena Winterrowd2015-01-282-2/+17
* | | | | | | am 2899991e: am 5cf91c50: libstagefright: httplive: Add NULL check for empty ...Leena Winterrowd2015-01-291-1/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 5cf91c50: libstagefright: httplive: Add NULL check for empty playlistLeena Winterrowd2015-01-291-1/+6
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | libstagefright: httplive: Add NULL check for empty playlistLeena Winterrowd2015-01-281-1/+6
* | | | | | | resolved conflicts for merge of 44a2390b to lmp-mr1-dev-plus-aospLajos Molnar2015-01-297-71/+14
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am f0d68993: Revert "HLS: QCom enhancements"Lajos Molnar2015-01-297-71/+14
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Revert "HLS: QCom enhancements"Lajos Molnar2015-01-287-71/+14
* | | | | | | am 8c403b22: am c84bc78d: Merge "Audio policy: fix device gain initialization...Eric Laurent2015-01-292-5/+15
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am c84bc78d: Merge "Audio policy: fix device gain initialization" into lmp-mr...Eric Laurent2015-01-292-5/+15
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Audio policy: fix device gain initialization" into lmp-mr1-devEric Laurent2015-01-292-5/+15
| | |\ \ \ \ \
| | | * | | | | Audio policy: fix device gain initializationEric Laurent2015-01-272-5/+15
| | | | |_|_|/ | | | |/| | |
* | | | | | | am a3c9d5c3: am 166776fb: Merge "Add missing includes."Elliott Hughes2015-01-294-0/+5
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | am 166776fb: Merge "Add missing includes."Elliott Hughes2015-01-294-0/+5
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge "Add missing includes."Elliott Hughes2015-01-294-0/+5
| | |\ \ \ \ \
| | | * | | | | Add missing includes.Elliott Hughes2015-01-284-0/+5
| | | | |_|_|/ | | | |/| | |
* | | | | | | am 29e609a8: am 628d4ea1: Merge "stagefright: do not reject SPL5 files outrig...Ronghua Wu2015-01-281-2/+2
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | am 628d4ea1: Merge "stagefright: do not reject SPL5 files outright in SoftMpe...Ronghua Wu2015-01-281-2/+2
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge "stagefright: do not reject SPL5 files outright in SoftMpeg4 decoder" i...Ronghua Wu2015-01-281-2/+2
| | |\ \ \ \ \
| | | * | | | | stagefright: do not reject SPL5 files outright in SoftMpeg4 decoderRonghua Wu2015-01-281-2/+2
| | | | |_|_|/ | | | |/| | |
* | | | | | | am ba553472: am aeccbffd: Merge "Avoid mixing declarations and statements in ...Andreas Gampe2015-01-281-2/+1
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | am aeccbffd: Merge "Avoid mixing declarations and statements in C89 source fi...Andreas Gampe2015-01-281-2/+1
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge "Avoid mixing declarations and statements in C89 source files"Andreas Gampe2015-01-281-2/+1
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Avoid mixing declarations and statements in C89 source filesMartin Storsjo2014-12-301-2/+1
* | | | | | | am 0bd5274e: am 231406d5: NuPlayerRenderer: return current real time as rende...Wei Jia2015-01-282-15/+18
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | am 231406d5: NuPlayerRenderer: return current real time as render time for vi...Wei Jia2015-01-282-15/+18
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | NuPlayerRenderer: return current real time as render time for video frame whe...Wei Jia2015-01-272-15/+18
| | | |_|_|/ | | |/| | |
* | | | | | Add missing AudioPolicy.cpp to Android.mkBrian Carlstrom2015-01-271-1/+2
* | | | | | resolved conflicts for merge of b955b722 to lmp-mr1-dev-plus-aospMarco Nelissen2015-01-2714-1925/+4
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | am 47deb15e: Merge "Remove MediaPlayerService::decode()"Marco Nelissen2015-01-2714-1920/+13
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge "Remove MediaPlayerService::decode()"Marco Nelissen2015-01-2714-1920/+13
| | |\ \ \ \
| | | * | | | Remove MediaPlayerService::decode()Marco Nelissen2015-01-2614-1920/+13
* | | | | | | am 64b08d23: am cbb803a5: Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-01-269-16/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am cbb803a5: Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-01-269-16/+7
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-01-269-16/+7
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Remove superfluous OpenSSL include paths.Adam Langley2015-01-229-16/+7
| | |/ / / /
* | | | | | am 1f7101ee: am 64c496c8: Merge "Fix MTP delete" into lmp-mr1-devMarco Nelissen2015-01-231-2/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | am 64c496c8: Merge "Fix MTP delete" into lmp-mr1-devMarco Nelissen2015-01-231-2/+2
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge "Fix MTP delete" into lmp-mr1-devMarco Nelissen2015-01-231-2/+2
| | |\ \ \ \
| | | * | | | Fix MTP deleteMarco Nelissen2015-01-231-2/+2
* | | | | | | am d8aff827: am ddc1216d: Merge "MPEG4Extractor: more NULL derefernce fixes i...Robert Shih2015-01-231-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /