summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* LP64 fixes for media/libeffectsAshok Bhat2014-02-2014-61/+62
* Merge "libeffects: don't set module path"Colin Cross2014-02-141-1/+0
|\
| * libeffects: don't set module pathColin Cross2014-02-131-1/+0
|/
* 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
|/
* 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
* | 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
|/ /
* | Merge "frameworks/av: fix errors inside ALOGV"Colin Cross2014-02-101-1/+1
|\ \ | |/ |/|
| * frameworks/av: fix errors inside ALOGVColin Cross2014-02-101-1/+1
* | 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
* | | 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
* | | 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
* | | | 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
* | | | | 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
| |/ / / /
* | | | | Merge "M3UParser: Fix typo in 8883a38a308"Marco Nelissen2014-02-101-1/+1
|\ \ \ \ \
| * | | | | M3UParser: Fix typo in 8883a38a308Martin Storsjo2014-02-101-1/+1
|/ / / / /
* | | | | 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
* | | | | Merge "frameworks/av: fix errors inside ALOGV"Colin Cross2014-02-074-5/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | frameworks/av: fix errors inside ALOGVColin Cross2014-02-064-5/+4
|/ / / /
* | | | Merge "audioflinger: conform inline ASM to UAL"Glenn Kasten2014-02-051-2/+2
|\ \ \ \
| * | | | audioflinger: conform inline ASM to UALsynergy dev2014-02-041-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
|/ / /
* | | 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
|/ / /
* | | Merge "audioflinger: fix static track end detection"Eric Laurent2014-01-311-9/+2
|\ \ \
| * | | audioflinger: fix static track end detectionEric Laurent2014-01-301-9/+2
* | | | Merge "frameworks/av: Rename persist.sys.dalvik.vm.lib to allow new default"Brian Carlstrom2014-01-301-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | frameworks/av: Rename persist.sys.dalvik.vm.lib to allow new defaultBrian Carlstrom2014-01-301-1/+1
|/ / /
* | | Merge "AudioMixer: Remove tracks from enabledTracks after reseting outTemp"Glenn Kasten2014-01-291-4/+7
|\ \ \
| * | | AudioMixer: Remove tracks from enabledTracks after reseting outTempGaurav Kumar2014-01-291-4/+7
* | | | Merge "frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATH"Colin Cross2014-01-288-10/+10
|\ \ \ \
| * | | | frameworks/av: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATHColin Cross2014-01-278-10/+10
|/ / / /
* | | | Merge "Only increase the counter when we do take a wakelock"Eric Laurent2014-01-271-5/+7
|\ \ \ \
| * | | | Only increase the counter when we do take a wakelockJimmy Dalqvist2014-01-221-5/+7
* | | | | Merge "Do partial reads in MemoryLeakTrackUtil"Eric Laurent2014-01-271-3/+11
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Do partial reads in MemoryLeakTrackUtilOscar Rydhé2014-01-231-3/+11
|/ / / /
* | | | Merge "Long mp3 metadata displays as corrupted file after transfer"Marco Nelissen2014-01-173-18/+26
|\ \ \ \
| * | | | Long mp3 metadata displays as corrupted file after transferYin Liu2013-12-203-18/+26
* | | | | Merge "Added support for ID3v2 meta data in 3gp files"Marco Nelissen2014-01-176-9/+91
|\ \ \ \ \
| * | | | | Added support for ID3v2 meta data in 3gp filesOscar Rydhé2014-01-166-9/+91
* | | | | | Merge "Fix compile error in NuPlayerRenderer debug print"Marco Nelissen2014-01-171-1/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |