summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 33cc5c91: am f143b608: am d1aeff55: Merge "Fix build with clang in C++11 m...Lajos Molnar2014-12-0937-98/+98
|\
| * am f143b608: am d1aeff55: Merge "Fix build with clang in C++11 mode"Lajos Molnar2014-12-0937-98/+98
| |\
| | * am d1aeff55: Merge "Fix build with clang in C++11 mode"Lajos Molnar2014-12-0937-98/+98
| | |\
| | | * Merge "Fix build with clang in C++11 mode"Lajos Molnar2014-12-0937-98/+98
| | | |\
| | | | * Fix build with clang in C++11 modeBernhard Rosenkränzer2014-11-2737-98/+98
* | | | | am 853bc5a2: am f3c25346: am 66172f5c: Merge "Cast int64_t values to long lon...Lajos Molnar2014-12-091-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | am f3c25346: am 66172f5c: Merge "Cast int64_t values to long long before print."Lajos Molnar2014-12-091-2/+2
| |\ \ \ \ | | |/ / /
| | * | | am 66172f5c: Merge "Cast int64_t values to long long before print."Lajos Molnar2014-12-091-2/+2
| | |\ \ \ | | | |/ /
| | | * | Merge "Cast int64_t values to long long before print."Lajos Molnar2014-12-091-2/+2
| | | |\ \
| | | | * | Cast int64_t values to long long before print.Bernhard Rosenkränzer2014-12-041-2/+2
* | | | | | am 08fa30dc: am 5abc1201: am 3cc93734: Merge "Fix build with clang"Lajos Molnar2014-12-091-2/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 5abc1201: am 3cc93734: Merge "Fix build with clang"Lajos Molnar2014-12-091-2/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 3cc93734: Merge "Fix build with clang"Lajos Molnar2014-12-091-2/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "Fix build with clang"Lajos Molnar2014-12-091-2/+1
| | | |\ \ \
| | | | * | | Fix build with clangBernhard Rosenkränzer2014-12-081-2/+1
| | | | |/ /
* | | | | | am 9f4a2d35: am 54a6b2e1: am 56335ae2: Merge "Prevent ANR when AudioTrack is ...Glenn Kasten2014-12-090-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 54a6b2e1: am 56335ae2: Merge "Prevent ANR when AudioTrack is paused or re-...Glenn Kasten2014-12-090-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 56335ae2: Merge "Prevent ANR when AudioTrack is paused or re-routed"Glenn Kasten2014-12-091-0/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "Prevent ANR when AudioTrack is paused or re-routed"Glenn Kasten2014-12-091-0/+2
| | | |\ \ \
| | | | * | | Prevent ANR when AudioTrack is paused or re-routedzunkyu.lee2014-12-081-0/+2
| | | | | |/ | | | | |/|
* | | | | | am 80ddb730: am ce48b3a8: am f3df58c7: Merge "Stagefright: Fix unused variables"Andreas Gampe2014-12-092-4/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am ce48b3a8: am f3df58c7: Merge "Stagefright: Fix unused variables"Andreas Gampe2014-12-092-4/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | am f3df58c7: Merge "Stagefright: Fix unused variables"Andreas Gampe2014-12-082-4/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "Stagefright: Fix unused variables"Andreas Gampe2014-12-082-4/+1
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | | | * | Stagefright: Fix unused variablesAndreas Gampe2014-12-042-4/+1
| | | |/ /
* | | | | am 9574b644: am c1b0d49c: am 82a69ea8: Prevent ANR when AudioTrack is paused ...zunkyu.lee2014-12-091-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | am c1b0d49c: am 82a69ea8: Prevent ANR when AudioTrack is paused or re-routedzunkyu.lee2014-12-091-0/+2
| |\ \ \ \
| | * \ \ \ am 82a69ea8: Prevent ANR when AudioTrack is paused or re-routedzunkyu.lee2014-12-091-0/+2
| | |\ \ \ \
| | | * | | | Prevent ANR when AudioTrack is paused or re-routedzunkyu.lee2014-12-081-0/+2
* | | | | | | am 3ca2794e: am 0b672c8b: am ca7b4bc4: mediaplayerservice: add support for le...Lajos Molnar2014-12-091-3/+32
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 0b672c8b: am ca7b4bc4: mediaplayerservice: add support for legacy DRMLajos Molnar2014-12-081-3/+32
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am ca7b4bc4: mediaplayerservice: add support for legacy DRMLajos Molnar2014-12-061-3/+32
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | mediaplayerservice: add support for legacy DRMLajos Molnar2014-12-051-3/+32
* | | | | | | am e09bf824: am 6874ed79: am a9d2f9fb: Merge "stagefright: preserve output fo...Lajos Molnar2014-12-092-2/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 6874ed79: am a9d2f9fb: Merge "stagefright: preserve output format flags on...Lajos Molnar2014-12-082-2/+6
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am a9d2f9fb: Merge "stagefright: preserve output format flags on format chang...Lajos Molnar2014-12-062-2/+6
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "stagefright: preserve output format flags on format change" into lmp-m...Lajos Molnar2014-12-062-2/+6
| | | |\ \ \ \
| | | | * | | | stagefright: preserve output format flags on format changeLajos Molnar2014-12-052-2/+6
* | | | | | | | am 1ed99f0c: am 2b02f140: am 80c57d57: Merge "NuPlayerRenderer: Update mAncho...Wei Jia2014-12-094-1/+16
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 2b02f140: am 80c57d57: Merge "NuPlayerRenderer: Update mAnchorMaxMediaUs w...Wei Jia2014-12-084-1/+16
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 80c57d57: Merge "NuPlayerRenderer: Update mAnchorMaxMediaUs when anchor ti...Wei Jia2014-12-064-1/+16
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge "NuPlayerRenderer: Update mAnchorMaxMediaUs when anchor time is changed...Wei Jia2014-12-064-1/+16
| | | |\ \ \ \ \
| | | | * | | | | NuPlayerRenderer: Update mAnchorMaxMediaUs when anchor time is changed to fix...Wei Jia2014-12-054-1/+16
* | | | | | | | | am b156888d: am 427aca5b: am 18265202: Merge "audio policy: fix inifinite loo...Eric Laurent2014-12-091-5/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 427aca5b: am 18265202: Merge "audio policy: fix inifinite loop in clearAud...Eric Laurent2014-12-081-5/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 18265202: Merge "audio policy: fix inifinite loop in clearAudioPatches()" ...Eric Laurent2014-12-061-5/+2
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge "audio policy: fix inifinite loop in clearAudioPatches()" into lmp-mr1-devEric Laurent2014-12-061-5/+2
| | | |\ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | | * | | | | audio policy: fix inifinite loop in clearAudioPatches()Eric Laurent2014-12-051-5/+2
* | | | | | | | | am e4fe1b62: am 876c21b1: am a147c17a: Merge "fixes for non-secure widevine p...Chong Zhang2014-12-092-13/+32
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 876c21b1: am a147c17a: Merge "fixes for non-secure widevine playback" into...Chong Zhang2014-12-082-13/+32
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /