summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | am 7b7f17dc: am b7c8e918: Add support for HLS playlists of type \'event\'.Andreas Huber2012-11-2823-46/+276
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am b7c8e918: Add support for HLS playlists of type \'event\'.Andreas Huber2012-11-2823-46/+276
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Add support for HLS playlists of type 'event'.Andreas Huber2012-11-2723-46/+276
* | | | | | Fix master build.Ben Murdoch2012-11-281-1/+1
* | | | | | am 5d7b2778: resolved conflicts for merge of 41829f30 to jb-mr1-dev-plus-aospGlenn Kasten2012-11-270-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | resolved conflicts for merge of 41829f30 to jb-mr1-dev-plus-aospGlenn Kasten2012-11-2710-4870/+1341
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "New VHQ resampler" into jb-mr1.1-devGlenn Kasten2012-11-2711-4818/+1427
| | |\ \ \ \
| | | * | | | New VHQ resamplerGlenn Kasten2012-11-2711-4818/+1427
* | | | | | | am b8fa1240: am aa9e3e01: Camera: Play shutter sound iff enableShutterSound(t...Igor Murashkin2012-11-273-9/+14
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am aa9e3e01: Camera: Play shutter sound iff enableShutterSound(true) && Shutt...Igor Murashkin2012-11-273-9/+14
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Camera: Play shutter sound iff enableShutterSound(true) && ShutterCallback !nullIgor Murashkin2012-11-263-9/+14
| | |/ / / /
* | | | | | am 8b5985d9: am 5768fa03: Merge "Crash in android::MyHandler::parsePlayResponse"Andreas Huber2012-11-271-0/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 5768fa03: Merge "Crash in android::MyHandler::parsePlayResponse"Andreas Huber2012-11-271-0/+4
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "Crash in android::MyHandler::parsePlayResponse"Andreas Huber2012-11-271-0/+4
| | |\ \ \ \
| | | * | | | Crash in android::MyHandler::parsePlayResponsePatric Frederiksen2012-11-271-0/+4
| | | | |_|/ | | | |/| |
* | | | | | am 9abbd0fb: am 3eb46d17: Merge "Fix of uninitialized mIsDrm variable."Andreas Huber2012-11-271-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 3eb46d17: Merge "Fix of uninitialized mIsDrm variable."Andreas Huber2012-11-271-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Fix of uninitialized mIsDrm variable."Andreas Huber2012-11-271-1/+1
| | |\ \ \ \
| | | * | | | Fix of uninitialized mIsDrm variable.Henrik B Andersson2012-11-271-1/+1
| | | |/ / /
* | | | | | am 5bc5bf39: am 79fd6853: Merge "MediaCodec: Add a method for getting the com...Andreas Huber2012-11-262-4/+44
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 79fd6853: Merge "MediaCodec: Add a method for getting the component name"Andreas Huber2012-11-262-4/+44
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "MediaCodec: Add a method for getting the component name"Andreas Huber2012-11-262-4/+44
| | |\ \ \ \
| | | * | | | MediaCodec: Add a method for getting the component nameMartin Storsjo2012-11-192-4/+44
| | | |/ / /
* | | | | | am 21006fa5: (-s ours) am 5865ddf7: Merge "AudioTrack::dump null mCblk check ...Marco Nelissen2012-11-260-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 5865ddf7: Merge "AudioTrack::dump null mCblk check test"Marco Nelissen2012-11-261-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "AudioTrack::dump null mCblk check test"Marco Nelissen2012-11-261-1/+1
| | |\ \ \ \
| | | * | | | AudioTrack::dump null mCblk check testZbigniew Mazur2012-11-231-1/+1
| | | |/ / /
* | | | | | am b96c4b4c: am 2da6e4ae: Merge "Avoid memory leaks when handling metadata st...Marco Nelissen2012-11-201-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 2da6e4ae: Merge "Avoid memory leaks when handling metadata strings"Marco Nelissen2012-11-201-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Avoid memory leaks when handling metadata strings"Marco Nelissen2012-11-201-1/+1
| | |\ \ \ \
| | | * | | | Avoid memory leaks when handling metadata stringsDavid Williams2012-11-201-1/+1
| | |/ / / /
* | | | | | Merge "AudioFlinger files reorganization"Eric Laurent2012-11-2011-9336/+9647
|\ \ \ \ \ \
| * | | | | | AudioFlinger files reorganizationEric Laurent2012-11-1911-9336/+9647
* | | | | | | am 14dda623: am 7013209c: Merge "Handle large AVCC chunks"Andreas Huber2012-11-201-6/+4
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am 7013209c: Merge "Handle large AVCC chunks"Andreas Huber2012-11-201-6/+4
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge "Handle large AVCC chunks"Andreas Huber2012-11-201-6/+4
| | |\ \ \ \ \
| | | * | | | | Handle large AVCC chunksJan Olof Svensson2012-11-191-6/+4
| | | | |/ / / | | | |/| | |
* | | | | | | am 343f9c81: am dca2b5d7: Merge "Changed parsing of trkn and disk from 8 bits...Marco Nelissen2012-11-201-5/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am dca2b5d7: Merge "Changed parsing of trkn and disk from 8 bits to 16 bits"Marco Nelissen2012-11-201-5/+7
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Changed parsing of trkn and disk from 8 bits to 16 bits"Marco Nelissen2012-11-201-5/+7
| | |\ \ \ \ \
| | | * | | | | Changed parsing of trkn and disk from 8 bits to 16 bitsAndreas Lillvik2012-11-191-5/+7
| | | |/ / / /
* | | | | | | fix a typo in SINC resampler that prevented tracks to be mixedMathias Agopian2012-11-191-2/+2
| |_|_|/ / / |/| | | | |
* | | | | | Merge "Clean up channel count and channel mask"Glenn Kasten2012-11-196-37/+27
|\ \ \ \ \ \
| * | | | | | Clean up channel count and channel maskGlenn Kasten2012-11-196-37/+27
* | | | | | | delete -> freeMarco Nelissen2012-11-191-1/+1
|/ / / / / /
* | | | | | Merge ""if" statements use curly braces per media style"Glenn Kasten2012-11-163-48/+140
|\ \ \ \ \ \
| * | | | | | "if" statements use curly braces per media styleGlenn Kasten2012-11-163-48/+140
| | |_|_|_|/ | |/| | | |
* | | | | | Merge "Fix time vs. bytes units bug in getRenderPosition"Glenn Kasten2012-11-163-24/+21
|\ \ \ \ \ \
| * | | | | | Fix time vs. bytes units bug in getRenderPositionGlenn Kasten2012-11-163-24/+21
* | | | | | | Merge "Don't use control block frame count after create"Glenn Kasten2012-11-166-80/+100
|\ \ \ \ \ \ \