summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am af191eb4: Merge "Replace size_t in shared memory by uint32_t"Glenn Kasten2014-03-073-12/+31
|\
| * Merge "Replace size_t in shared memory by uint32_t"Glenn Kasten2014-02-133-12/+31
| |\
| | * Replace size_t in shared memory by uint32_tGlenn Kasten2014-02-133-12/+31
| |/
* | am 7eacea11: Merge "avcenc: Only do startcode escaping if the next byte requi...Lajos Molnar2014-03-071-6/+9
|\ \ | |/
| * Merge "avcenc: Only do startcode escaping if the next byte requires it"Lajos Molnar2014-02-111-6/+9
| |\
| | * avcenc: Only do startcode escaping if the next byte requires itMartin Storsjo2014-02-111-6/+9
* | | am 3c9130a8: Merge "Make frameworks/av 64-bit compatible"Narayan Kamath2014-03-0759-187/+219
|\ \ \ | |/ /
| * | Merge "Make frameworks/av 64-bit compatible"Narayan Kamath2014-02-1159-187/+219
| |\ \
| | * | Make frameworks/av 64-bit compatibleKévin PETIT2014-02-1159-187/+219
| |/ /
* | | am cdda7bf4: Merge "frameworks/av: fix errors inside ALOGV"Colin Cross2014-03-071-1/+1
|\ \ \ | |/ /
| * | Merge "frameworks/av: fix errors inside ALOGV"Colin Cross2014-02-101-1/+1
| |\ \ | | |/ | |/|
| | * frameworks/av: fix errors inside ALOGVColin Cross2014-02-101-1/+1
* | | am 5930e8eb: Merge "AudioFlinger: Remove code for supporting resampling in fa...Glenn Kasten2014-03-074-26/+5
|\ \ \ | |/ /
| * | Merge "AudioFlinger: Remove code for supporting resampling in fast tracks"Glenn Kasten2014-02-104-26/+5
| |\ \
| | * | AudioFlinger: Remove code for supporting resampling in fast tracksMartin Storsjo2014-02-054-26/+5
* | | | am 4361749d: Merge "AudioTrack: Never try to use the fast path if resampling ...Glenn Kasten2014-03-073-5/+6
|\ \ \ \ | |/ / /
| * | | Merge "AudioTrack: Never try to use the fast path if resampling is required"Glenn Kasten2014-02-103-5/+6
| |\ \ \ | | |/ /
| | * | AudioTrack: Never try to use the fast path if resampling is requiredMartin Storsjo2014-01-313-5/+6
* | | | am 7142d10a: Merge "avcenc: Update video port parameters in the base class"Lajos Molnar2014-03-071-0/+11
|\ \ \ \ | |/ / /
| * | | Merge "avcenc: Update video port parameters in the base class"Lajos Molnar2014-02-101-0/+11
| |\ \ \
| | * | | avcenc: Update video port parameters in the base classMartin Storsjo2013-11-211-0/+11
* | | | | am 61bdaaa1: Merge "ChromiumHTTPDataSource: Keep track of the redirected URL"Lajos Molnar2014-03-073-0/+7
|\ \ \ \ \ | |/ / / /
| * | | | Merge "ChromiumHTTPDataSource: Keep track of the redirected URL"Lajos Molnar2014-02-103-0/+7
| |\ \ \ \
| | * | | | ChromiumHTTPDataSource: Keep track of the redirected URLMartin Storsjo2013-11-253-0/+7
* | | | | | am 88e99f9a: Merge "SoftVPXEncoder: Set the frame size on the output port as ...Lajos Molnar2014-03-071-0/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "SoftVPXEncoder: Set the frame size on the output port as well"Lajos Molnar2014-02-101-0/+3
| |\ \ \ \ \
| | * | | | | SoftVPXEncoder: Set the frame size on the output port as wellMartin Storsjo2013-11-251-0/+3
| | |/ / / /
* | | | | | am 44f2b8c2: Merge "M3UParser: Fix typo in 8883a38a308"Marco Nelissen2014-03-071-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "M3UParser: Fix typo in 8883a38a308"Marco Nelissen2014-02-101-1/+1
| |\ \ \ \ \
| | * | | | | M3UParser: Fix typo in 8883a38a308Martin Storsjo2014-02-101-1/+1
| |/ / / / /
* | | | | | am 8519b8a1: Merge "M3UParser: Skip query strings when looking for the last s...Marco Nelissen2014-03-071-12/+22
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "M3UParser: Skip query strings when looking for the last slash in a URL"Marco Nelissen2014-02-101-12/+22
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | M3UParser: Skip query strings when looking for the last slash in a URLMartin Storsjo2014-02-051-12/+22
* | | | | | am e2307ccb: Merge "frameworks/av: fix errors inside ALOGV"Colin Cross2014-03-074-5/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "frameworks/av: fix errors inside ALOGV"Colin Cross2014-02-074-5/+4
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | frameworks/av: fix errors inside ALOGVColin Cross2014-02-064-5/+4
| |/ / / /
* | | | | am d66cd743: Merge "audioflinger: conform inline ASM to UAL"Glenn Kasten2014-03-071-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge "audioflinger: conform inline ASM to UAL"Glenn Kasten2014-02-051-2/+2
| |\ \ \ \
| | * | | | audioflinger: conform inline ASM to UALsynergy dev2014-02-041-2/+2
| |/ / / /
* | | | | am 5db1e3a6: Merge "correct one logic error in decide whether should render o...Lajos Molnar2014-03-072-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge "correct one logic error in decide whether should render or not"Lajos Molnar2014-02-032-2/+2
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | correct one logic error in decide whether should render or notJianzheng Zhou2014-02-032-2/+2
| |/ / /
* | | | am c4eef29a: Merge "fix deadlock issues that arise when there are simultaneou...Eric Laurent2014-03-070-0/+0
|\ \ \ \ | |/ / /
| * | | Merge "fix deadlock issues that arise when there are simultaneous effect cont...Eric Laurent2014-01-316-55/+88
| |\ \ \
| | * | | fix deadlock issues that arise when there are simultaneousjpadmana2014-01-316-55/+88
| |/ / /
* | | | am b447379e: Merge "audioflinger: fix static track end detection"Eric Laurent2014-03-070-0/+0
|\ \ \ \ | |/ / /
| * | | Merge "audioflinger: fix static track end detection"Eric Laurent2014-01-311-9/+2
| |\ \ \
| | * | | audioflinger: fix static track end detectionEric Laurent2014-01-301-9/+2
* | | | | am 60181e36: Merge "frameworks/av: Rename persist.sys.dalvik.vm.lib to allow ...Brian Carlstrom2014-03-071-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "frameworks/av: Rename persist.sys.dalvik.vm.lib to allow new default"Brian Carlstrom2014-01-301-1/+1
| |\ \ \ \ | | |/ / / | |/| | |