summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am bf14c62e: am 72bf901c: Merge "audio policy: new getOutputForAttr() prototy...Eric Laurent2014-11-264-223/+128
|\
| * Merge "audio policy: new getOutputForAttr() prototype." into lmp-mr1-devEric Laurent2014-11-264-223/+128
| |\
| | * audio policy: new getOutputForAttr() prototype.Eric Laurent2014-11-254-223/+128
* | | am 1e18795a: am d325005e: Merge "Fix AudioTrack loop mode to play audio from ...Andy Hung2014-11-262-4/+9
|\ \ \ | |/ /
| * | Merge "Fix AudioTrack loop mode to play audio from buffer start" into lmp-mr1...Andy Hung2014-11-252-4/+9
| |\ \
| | * | Fix AudioTrack loop mode to play audio from buffer startAndy Hung2014-11-242-4/+9
* | | | am 20918be9: am b2cf160f: Merge "stagefright: add graceful handling when sett...Lajos Molnar2014-11-261-12/+12
|\ \ \ \ | |/ / /
| * | | Merge "stagefright: add graceful handling when setting port definition" into ...Lajos Molnar2014-11-251-12/+12
| |\ \ \ | | |_|/ | |/| |
| | * | stagefright: add graceful handling when setting port definitionLajos Molnar2014-11-251-12/+12
| | |/
* | | am 1a475921: am 223fd5c9: audio: new routing strategies and stream typesEric Laurent2014-11-261-1/+1
|\ \ \ | |/ /
| * | audio: new routing strategies and stream typesEric Laurent2014-11-211-1/+1
| |/
* | am e464018a: am f59eae94: Merge "Fix overload of SoftVideoDecoderOMXComponent...Chih-hung Hsieh2014-11-252-3/+3
|\ \
| * \ Merge "Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions"Chih-hung Hsieh2014-11-252-3/+3
| |\ \
| | * | Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitionsBernhard Rosenkränzer2014-11-202-3/+3
* | | | am 7fca411f: am b44760cf: Merge "Remove deprecated register keyword"Chih-hung Hsieh2014-11-251-1/+1
|\ \ \ \ | |/ / /
| * | | Remove deprecated register keywordBernhard Rosenkränzer2014-11-251-1/+1
* | | | am e30dc38b: am 7877cb80: Merge "Img_utils: Fix "unused" variables"Andreas Gampe2014-11-252-2/+2
|\ \ \ \ | |/ / /
| * | | Merge "Img_utils: Fix "unused" variables"Andreas Gampe2014-11-252-2/+2
| |\ \ \
| | * | | 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