summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 9111465a: am ec9459c6: Merge "close fd if data source is reset without pre...Chong Zhang2014-11-211-1/+7
|\
| * am ec9459c6: Merge "close fd if data source is reset without prepare" into lm...Chong Zhang2014-11-201-1/+7
| |\
| | * Merge "close fd if data source is reset without prepare" into lmp-mr1-devChong Zhang2014-11-201-1/+7
| | |\
| | | * close fd if data source is reset without prepareChong Zhang2014-11-191-1/+7
* | | | am f8c2d166: am a7cf01da: Merge "Fix missing loop count for static tracks." i...Glenn Kasten2014-11-212-23/+46
|\ \ \ \ | |/ / /
| * | | am a7cf01da: Merge "Fix missing loop count for static tracks." into lmp-mr1-devGlenn Kasten2014-11-202-23/+46
| |\ \ \ | | |/ /
| | * | Merge "Fix missing loop count for static tracks." into lmp-mr1-devGlenn Kasten2014-11-202-23/+46
| | |\ \
| | | * | Fix missing loop count for static tracks.Andy Hung2014-11-182-23/+46
* | | | | am 9dad026b: am 574aed90: Merge "When aggregating buffers, make sure we don\'...Marco Nelissen2014-11-211-0/+6
|\ \ \ \ \ | |/ / / /
| * | | | am 574aed90: Merge "When aggregating buffers, make sure we don\'t lose data" ...Marco Nelissen2014-11-201-0/+6
| |\ \ \ \ | | |/ / /
| | * | | Merge "When aggregating buffers, make sure we don't lose data" into lmp-mr1-devMarco Nelissen2014-11-201-0/+6
| | |\ \ \
| | | * | | When aggregating buffers, make sure we don't lose dataMarco Nelissen2014-11-191-0/+6
* | | | | | am 568689b1: am 3a2a32b5: Merge "AudioSystem: fix cross deadlock" into lmp-mr...Eric Laurent2014-11-214-53/+71
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 3a2a32b5: Merge "AudioSystem: fix cross deadlock" into lmp-mr1-devEric Laurent2014-11-204-53/+71
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "AudioSystem: fix cross deadlock" into lmp-mr1-devEric Laurent2014-11-204-53/+71
| | |\ \ \ \
| | | * | | | AudioSystem: fix cross deadlockEric Laurent2014-11-204-53/+71
* | | | | | | am 902dc42d: am 07715ac3: Merge "C++11 compatibility."Dan Albert2014-11-209-24/+32
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ am 07715ac3: Merge "C++11 compatibility."Dan Albert2014-11-209-24/+32
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge "C++11 compatibility."Dan Albert2014-11-209-24/+32
| | |\ \ \ \ \ \ \
| | | * | | | | | | C++11 compatibility.Dan Albert2014-11-209-24/+32
* | | | | | | | | | am 8ed5afa3: Merge "mediaplayer: request auto-frc for high quality avsync" in...Lajos Molnar2014-11-201-0/+13
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | am 8ed5afa3: Merge "mediaplayer: request auto-frc for high quality avsync" in...Lajos Molnar2014-11-201-0/+13
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | Merge "mediaplayer: request auto-frc for high quality avsync" into lmp-mr1-devLajos Molnar2014-11-201-0/+13
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | mediaplayer: request auto-frc for high quality avsyncLajos Molnar2014-11-191-0/+13
| | | | |_|_|/ / / / | | | |/| | | | | |
* | | | | | | | | | am 6597c00f: stagefright: add (temporary) support for automatic video frcLajos Molnar2014-11-201-0/+18
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 6597c00f: stagefright: add (temporary) support for automatic video frcLajos Molnar2014-11-201-0/+18
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | stagefright: add (temporary) support for automatic video frcLajos Molnar2014-11-191-0/+18
| | |/ / / / / / /
* | | | | | | | | am d6048672: am 9d2e0dae: Merge "Remove extraneous parentheses"Chih-hung Hsieh2014-11-201-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | am 9d2e0dae: Merge "Remove extraneous parentheses"Chih-hung Hsieh2014-11-201-1/+1
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Merge "Remove extraneous parentheses"Chih-hung Hsieh2014-11-201-1/+1
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | | * | | | | | Remove extraneous parenthesesBernhard Rosenkränzer2014-11-201-1/+1
| | |/ / / / / /
* | | | | | | | am 0c999060: am 18899808: Merge "NuPlayer: open audio sink in offload mode wh...Ronghua Wu2014-11-193-5/+36
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | am 18899808: Merge "NuPlayer: open audio sink in offload mode when resuming f...Ronghua Wu2014-11-193-5/+36
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge "NuPlayer: open audio sink in offload mode when resuming from timeout t...Ronghua Wu2014-11-193-5/+36
| | |\ \ \ \ \ \
| | | * | | | | | NuPlayer: open audio sink in offload mode when resuming from timeout teardown.Ronghua Wu2014-11-183-5/+36
| | | | |_|/ / / | | | |/| | | |
* | | | | | | | am cd370c79: am de14fae7: Merge "Use standard syntax to initialize fields."Glenn Kasten2014-11-191-712/+712
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | am de14fae7: Merge "Use standard syntax to initialize fields."Glenn Kasten2014-11-191-712/+712
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Merge "Use standard syntax to initialize fields."Glenn Kasten2014-11-191-712/+712
| | |\ \ \ \ \ \
| | | * | | | | | Use standard syntax to initialize fields.Chih-Hung Hsieh2014-11-141-712/+712
* | | | | | | | | am cb79b3db: am 03181012: Merge "Camera2Client: remove recording stream if ne...Yin-Chia Yeh2014-11-193-7/+56
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | am 03181012: Merge "Camera2Client: remove recording stream if necessary" into...Yin-Chia Yeh2014-11-193-7/+56
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Merge "Camera2Client: remove recording stream if necessary" into lmp-mr1-devYin-Chia Yeh2014-11-193-7/+56
| | |\ \ \ \ \ \ \
| | | * | | | | | | Camera2Client: remove recording stream if necessaryYin-Chia Yeh2014-11-183-7/+56
* | | | | | | | | | am 4fd641be: am bbda5ce4: Merge "AudioSystem: Add mutex for output cache" int...Eric Laurent2014-11-192-41/+52
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am bbda5ce4: Merge "AudioSystem: Add mutex for output cache" into lmp-mr1-devEric Laurent2014-11-192-41/+52
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "AudioSystem: Add mutex for output cache" into lmp-mr1-devEric Laurent2014-11-192-41/+52
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | AudioSystem: Add mutex for output cacheEric Laurent2014-11-192-41/+52
| | | | |_|_|_|/ / / | | | |/| | | | | |
* | | | | | | | | | am 2bbc61fe: am 408dba5f: Merge "HLS: fix live lock after missing the boat du...Robert Shih2014-11-191-0/+20
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 408dba5f: Merge "HLS: fix live lock after missing the boat during configur...Robert Shih2014-11-191-0/+20
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "HLS: fix live lock after missing the boat during configuration change"...Robert Shih2014-11-191-0/+20
| | |\ \ \ \ \ \ \ \