summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Clean up some makefiles.Dan Albert2014-09-112-6/+1
* Merge "Add test for AMR-NB decoder"Glenn Kasten2014-09-112-0/+170
|\
| * Add test for AMR-NB decoderAshok Bhat2014-06-162-0/+170
* | Merge "Fix inline assembly for clang"Glenn Kasten2014-09-110-0/+0
|\ \
| * | Fix inline assembly for clangBernhard Rosenkränzer2013-12-131-2/+2
* | | Merge "Fix in SoftAVCEncoder plugin"Narayan Kamath2014-09-041-3/+4
|\ \ \
| * | | Fix in SoftAVCEncoder pluginAshok Bhat2014-07-091-3/+4
* | | | Merge "Move chromium_http/support.cpp off androidGetTid."Elliott Hughes2014-08-161-1/+1
|\ \ \ \
| * | | | Move chromium_http/support.cpp off androidGetTid.Elliott Hughes2014-08-181-1/+1
|/ / / /
* | | | Merge "Use gettid directly."Elliott Hughes2014-08-161-1/+1
|\ \ \ \
| * | | | Use gettid directly.Elliott Hughes2014-08-181-1/+1
|/ / / /
* | | | Merge "Revert "Fix build after side-stepping global -Bsymbolic.""Dan Albert2014-08-073-25/+0
|\ \ \ \
| * | | | Revert "Fix build after side-stepping global -Bsymbolic."Dan Albert2014-08-083-25/+0
* | | | | Merge "Fix PIC relocations for non-Bsymbolic builds"Dan Albert2014-08-077-0/+29
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix PIC relocations for non-Bsymbolic buildsArd Biesheuvel2014-08-087-0/+29
* | | | | Merge "Fix build after side-stepping global -Bsymbolic."Dan Albert2014-08-073-0/+25
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix build after side-stepping global -Bsymbolic.Dan Albert2014-08-073-0/+25
|/ / / /
* | | | Merge "Add SELinux MAC to DrmManagerService."Nick Kralevich2014-07-233-13/+91
|\ \ \ \
| * | | | Add SELinux MAC to DrmManagerService.Riley Spahn2014-07-253-13/+91
* | | | | Merge "Remove last user of <cutils/tztime.h>."Elliott Hughes2014-07-232-4/+2
|\ \ \ \ \
| * | | | | Remove last user of <cutils/tztime.h>.Elliott Hughes2014-07-242-4/+2
| |/ / / /
* | | | | Merge "Remove 64-bit android_atomic uses from StateQueue."Hans Boehm2014-07-232-12/+8
|\ \ \ \ \
| * | | | | Remove 64-bit android_atomic uses from StateQueue.Hans Boehm2014-07-232-12/+8
|/ / / / /
* | | | | Merge "stagefright: Fix seeking in MPEG4 container - do not merge"Lajos Molnar2014-07-224-120/+97
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | stagefright: Fix seeking in MPEG4 container - do not mergeLajos Molnar2014-07-224-120/+97
|/ / / /
* | | | Merge "M3UParser: check for NULL before setting meta data"Lajos Molnar2014-07-161-0/+6
|\ \ \ \
| * | | | M3UParser: check for NULL before setting meta dataRobert Shih2014-07-161-0/+6
|/ / / /
* | | | Merge "Fix M3UParser relative path handling."Lajos Molnar2014-07-161-1/+3
|\ \ \ \
| * | | | Fix M3UParser relative path handling.Lajos Molnar2014-07-161-1/+3
|/ / / /
* | | | Merge "Fix Externally reported security issue"Nick Kralevich2014-07-141-1/+12
|\ \ \ \
| * | | | Fix Externally reported security issueJeff Tinker2014-07-111-1/+12
* | | | | Merge "h264_enc: Use free() to release memory allocated with malloc()"Narayan Kamath2014-07-101-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | h264_enc: Use free() to release memory allocated with malloc()Ashok Bhat2014-06-251-2/+2
| | |_|/ | |/| |
* | | | Merge "Switch frameworks/av/media/libmedia to the new icu."Elliott Hughes2014-07-091-1/+1
|\ \ \ \
| * | | | Switch frameworks/av/media/libmedia to the new icu.Elliott Hughes2014-07-091-1/+1
| | |/ / | |/| |
* | | | Merge "m4v_h263_enc: Use uint32_t for ULong"Narayan Kamath2014-07-024-7/+7
|\ \ \ \ | |/ / / |/| | |
| * | | m4v_h263_enc: Use uint32_t for ULongAshok Bhat2014-07-024-7/+7
|/ / /
* | | Merge "DO NOT MERGE: Fix for SW video decoder OMX profile/level query"Lajos Molnar2014-06-241-3/+4
|\ \ \
| * | | DO NOT MERGE: Fix for SW video decoder OMX profile/level queryXiaosong Wei2014-06-241-3/+4
|/ / /
* | | Merge "libmediaplayerservice: unused argument warning messages"Mark Salyzyn2014-06-234-29/+29
|\ \ \
| * | | libmediaplayerservice: unused argument warning messagesMark Salyzyn2014-06-244-29/+29
|/ / /
* | | Merge "Fix buffer allocation"Marco Nelissen2014-06-201-1/+1
|\ \ \
| * | | Fix buffer allocationMarco Nelissen2014-06-231-1/+1
|/ / /
* | | Merge "Use char x[] rather than char x[0]."Elliott Hughes2014-06-121-1/+1
|\ \ \
| * | | Use char x[] rather than char x[0].Elliott Hughes2014-06-121-1/+1
* | | | Merge "Remove dependency on Parcel::{read,write}IntPtr"Narayan Kamath2014-06-101-2/+2
|\ \ \ \
| * | | | Remove dependency on Parcel::{read,write}IntPtrJeff Tinker2014-06-121-2/+2
| |/ / /
* | | | Merge "Update OMX messages for 64 bit"Narayan Kamath2014-06-1111-151/+237
|\ \ \ \ | |/ / / |/| | |
| * | | Update OMX messages for 64 bitAndy Hung2014-06-1211-151/+237
|/ / /
* | | Merge "Offer a type-safe album art interface."Elliott Hughes2014-06-118-84/+57
|\ \ \