summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 26d92768: am 34c55e3e: Merge "No need to #include atomic-inline.h if you h...Elliott Hughes2014-11-171-1/+0
|\
| * No need to #include atomic-inline.h if you have atomic.h.Elliott Hughes2014-11-171-1/+0
* | am d86450b9: am c80b9b83: Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-11-1711-13/+12
|\ \ | |/
| * Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-11-1711-13/+12
| |\
| | * Fix struct vs. class mismatchesBernhard Rosenkränzer2014-11-1711-13/+12
* | | am 2716969d: resolved conflicts for merge of 3bc345f5 to stage-aosp-masterElliott Hughes2014-11-171-12/+0
|\ \ \ | |/ /
| * | libcutils no longer requires that its users configure ANDROID_SMP.Elliott Hughes2014-11-171-2/+0
| |/
* | resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aospMarco Nelissen2014-11-1727-77/+76
|\ \
| * \ am 9b77083e: Merge "Update calls to IInterface::asBinder()"Marco Nelissen2014-11-1727-77/+76
| |\ \ | | |/
| | * Update calls to IInterface::asBinder()Marco Nelissen2014-11-1727-77/+76
* | | am bb0cf4d0: am d0264109: Merge "Move libldnhncr to libc++."Dan Albert2014-11-161-1/+0
|\ \ \ | |/ /
| * | am d0264109: Merge "Move libldnhncr to libc++."Dan Albert2014-11-161-1/+0
| |\ \ | | |/
| | * Move libldnhncr to libc++.Dan Albert2014-11-151-1/+0
| * | am a82b5f57: Merge "libstagefright: use __predict_false from bionic rather th...Mark Salyzyn2014-11-121-1/+1
| |\ \ | | |/
| | * libstagefright: use __predict_false from bionic rather than CONDITION from lo...Mark Salyzyn2014-11-111-1/+1
* | | am addfc718: Merge "NuPlayer: tunnel decoder with renderer for data buffer pa...Wei Jia2014-11-157-124/+205
|\ \ \
| * \ \ Merge "NuPlayer: tunnel decoder with renderer for data buffer passing." into ...Wei Jia2014-11-157-124/+205
| |\ \ \
| | * | | NuPlayer: tunnel decoder with renderer for data buffer passing.Wei Jia2014-11-147-124/+205
* | | | | am f97dfbc9: Merge "PlaylistFetcher: handle sporadic fetch erros" into lmp-mr...Robert Shih2014-11-151-27/+37
|\ \ \ \ \ | |/ / / /
| * | | | Merge "PlaylistFetcher: handle sporadic fetch erros" into lmp-mr1-devRobert Shih2014-11-151-27/+37
| |\ \ \ \
| | * | | | PlaylistFetcher: handle sporadic fetch errosRobert Shih2014-11-131-27/+37
* | | | | | am 990dad99: Merge "remove AudioSystem::getOutputSamplingRateForAttr()" into ...Eric Laurent2014-11-142-28/+15
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "remove AudioSystem::getOutputSamplingRateForAttr()" into lmp-mr1-devEric Laurent2014-11-142-28/+15
| |\ \ \ \ \
| | * | | | | remove AudioSystem::getOutputSamplingRateForAttr()Eric Laurent2014-11-122-28/+15
* | | | | | | am 41907c44: am cede28e2: Merge "stagefright: add runtime debug support" into...Lajos Molnar2014-11-149-440/+764
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "stagefright: add runtime debug support" into lmp-mr1-devLajos Molnar2014-11-149-440/+764
| |\ \ \ \ \ \
| | * | | | | | stagefright: add runtime debug supportLajos Molnar2014-11-129-440/+764
* | | | | | | | am 08961d0b: am 97e6ca1a: Merge "Stagefright: use MediaCodec in async mode fo...Chong Zhang2014-11-141-164/+105
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Stagefright: use MediaCodec in async mode for recording" into lmp-mr1-devChong Zhang2014-11-131-164/+105
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Stagefright: use MediaCodec in async mode for recordingPraveen Chavan2014-11-121-164/+105
* | | | | | | | am 285dc585: am 12acd3f0: Merge "AnotherPacketSource: need reset some members...Wei Jia2014-11-141-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "AnotherPacketSource: need reset some members before returning from que...Wei Jia2014-11-131-4/+4
| |\ \ \ \ \ \ \
| | * | | | | | | AnotherPacketSource: need reset some members before returning from queueDisco...Wei Jia2014-11-131-4/+4
| | | |_|_|/ / / | | |/| | | | |
* | | | | | | | am 85a5b99f: am 6641004b: Merge "Revert "mediaplayer: make frame-accurate avs...Lajos Molnar2014-11-131-20/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Revert "mediaplayer: make frame-accurate avsync configurable"" into lm...Lajos Molnar2014-11-131-20/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Revert "mediaplayer: make frame-accurate avsync configurable"Lajos Molnar2014-11-071-20/+0
* | | | | | | | | am 2458928e: am e0b7ddcd: Merge "PlaylistFetcher: check ts program streams be...Robert Shih2014-11-133-6/+32
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "PlaylistFetcher: check ts program streams before disabling a/v" into l...Robert Shih2014-11-133-6/+32
| |\ \ \ \ \ \ \ \
| | * | | | | | | | PlaylistFetcher: check ts program streams before disabling a/vRobert Shih2014-11-123-6/+32
* | | | | | | | | | am e418cfae: am 869e0798: Merge "MTP: add strict bounds checking for all inco...Mike Lockwood2014-11-1319-189/+386
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "MTP: add strict bounds checking for all incoming packets" into lmp-mr1...Mike Lockwood2014-11-1319-189/+386
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | * | | | | | | | MTP: add strict bounds checking for all incoming packetsMike Lockwood2014-11-1219-189/+386
* | | | | | | | | | am cf957fb7: am 94691b01: Merge "Fix Ogg Vorbis packet timestamps" into lmp-m...Marco Nelissen2014-11-121-14/+61
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Fix Ogg Vorbis packet timestamps" into lmp-mr1-devMarco Nelissen2014-11-121-14/+61
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| | * | | | | | | | Fix Ogg Vorbis packet timestampsMarco Nelissen2014-11-111-14/+61
* | | | | | | | | | am 233ef496: Merge "Fix looping sound playback" into lmp-mr1-dev automerge: 5...Marco Nelissen2014-11-121-0/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Fix looping sound playback" into lmp-mr1-devMarco Nelissen2014-11-121-0/+5
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | Fix looping sound playbackMarco Nelissen2014-11-111-0/+5
| | |/ / / / / / /
* | | | | | | | | am 745602d8: Merge "MediaCodec: Prevent stop() in the UNINITIALIZED state" in...Andy Hung2014-11-121-2/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "MediaCodec: Prevent stop() in the UNINITIALIZED state" into lmp-mr1-devAndy Hung2014-11-111-2/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |