summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | Img_utils: Fix "unused" variablesAndreas Gampe2014-11-242-2/+2
| | | |_|/ / | | |/| | |
* | | | | | am 0e4b8c2d: am d56a953a: Merge "Libcpustats: Remove unused variable"Andreas Gampe2014-11-251-1/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Libcpustats: Remove unused variableAndreas Gampe2014-11-251-1/+0
* | | | | | am 5d4eae1a: am e1b737ca: Merge "Remove unused parameter"chh2014-11-251-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Remove unused parameter"chh2014-11-251-1/+1
| |\ \ \ \ \
| | * | | | | Remove unused parameterBernhard Rosenkränzer2014-11-181-1/+1
* | | | | | | am 112ba592: am 6c7d332f: Merge "Remove bogus forward declarations"Chih-hung Hsieh2014-11-252-4/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Remove bogus forward declarations"Chih-hung Hsieh2014-11-242-4/+0
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Remove bogus forward declarationsBernhard Rosenkränzer2014-11-202-4/+0
| | | |/ / / | | |/| | |
* | | | | | am 865449b4: am e4f6ecb9: Merge "Stagefright: Fix default typo"Andreas Gampe2014-11-251-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Stagefright: Fix default typoAndreas Gampe2014-11-241-2/+2
* | | | | | am 128b7850: am db1ce33e: Merge "Remove check for an impossible condition"Chih-hung Hsieh2014-11-251-4/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Remove check for an impossible condition"Chih-hung Hsieh2014-11-241-4/+0
| |\ \ \ \ \
| | * | | | | Remove check for an impossible conditionBernhard Rosenkraenzer2014-10-041-4/+0
* | | | | | | am e9e6a930: am 3a8d7d10: Merge "tunnel NuPlayer source and decoder input" in...Chong Zhang2014-11-2113-1296/+1505
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge "tunnel NuPlayer source and decoder input" into lmp-mr1-devChong Zhang2014-11-2113-1296/+1505
| |\ \ \ \ \ \
| | * | | | | | tunnel NuPlayer source and decoder inputChong Zhang2014-11-2013-1296/+1505
* | | | | | | | am 2a424d6f: am 7966142a: Merge "NuPlayer: invalid anchor time when render is...Ronghua Wu2014-11-212-0/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "NuPlayer: invalid anchor time when render is flushed." into lmp-mr1-devRonghua Wu2014-11-202-0/+8
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | NuPlayer: invalid anchor time when render is flushed.Ronghua Wu2014-11-192-0/+8
* | | | | | | | am 9111465a: am ec9459c6: Merge "close fd if data source is reset without pre...Chong Zhang2014-11-211-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-211-22/+38
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Fix missing loop count for static tracks." into lmp-mr1-devGlenn Kasten2014-11-201-22/+38
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix missing loop count for static tracks.Andy Hung2014-11-181-22/+38
* | | | | | | | | | am 9dad026b: am 574aed90: Merge "When aggregating buffers, make sure we don\'...Marco Nelissen2014-11-211-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-211-43/+58
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "AudioSystem: fix cross deadlock" into lmp-mr1-devEric Laurent2014-11-201-43/+58
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | AudioSystem: fix cross deadlockEric Laurent2014-11-201-43/+58
* | | | | | | | | | | am 902dc42d: am 07715ac3: Merge "C++11 compatibility."Dan Albert2014-11-201-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge "C++11 compatibility."Dan Albert2014-11-201-4/+4
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | C++11 compatibility.Dan Albert2014-11-201-4/+4
| | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
* | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | 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 4fd641be: am bbda5ce4: Merge "AudioSystem: Add mutex for output cache" int...Eric Laurent2014-11-191-37/+47
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge "AudioSystem: Add mutex for output cache" into lmp-mr1-devEric Laurent2014-11-191-37/+47
| |\ \ \ \ \ \ \ \ \