summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 6bf7c5cf: Merge "Clean up test makefiles."Dan Albert2014-09-121-14/+2
|\
| * Merge "Clean up test makefiles."Dan Albert2014-09-111-14/+2
| |\
| | * Clean up test makefiles.Dan Albert2014-09-111-14/+2
* | | am 2b16391d: Merge "Add test for AMR-NB decoder"Glenn Kasten2014-09-112-0/+170
|\ \ \ | |/ /
| * | Merge "Add test for AMR-NB decoder"Glenn Kasten2014-09-112-0/+170
| |\ \ | | |/ | |/|
| | * Add test for AMR-NB decoderAshok Bhat2014-06-162-0/+170
* | | am 032ecb7f: Merge "Fix in SoftAVCEncoder plugin"Narayan Kamath2014-09-041-3/+4
|\ \ \ | |/ /
| * | Merge "Fix in SoftAVCEncoder plugin"Narayan Kamath2014-09-041-3/+4
| |\ \
| | * | Fix in SoftAVCEncoder pluginAshok Bhat2014-07-091-3/+4
* | | | am 45d2c7e1: Merge "Move chromium_http/support.cpp off androidGetTid."Elliott Hughes2014-08-181-1/+1
|\ \ \ \ | |/ / /
| * | | Move chromium_http/support.cpp off androidGetTid.Elliott Hughes2014-08-181-1/+1
* | | | am d29b4f65: Merge "Use gettid directly."Elliott Hughes2014-08-181-1/+1
|\ \ \ \ | |/ / /
| * | | Use gettid directly.Elliott Hughes2014-08-181-1/+1
* | | | am 5a192121: Merge "Revert "Fix build after side-stepping global -Bsymbolic.""Dan Albert2014-08-083-25/+0
|\ \ \ \ | |/ / /
| * | | 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
* | | | | am 9ee1572f: Merge "Fix PIC relocations for non-Bsymbolic builds"Dan Albert2014-08-087-0/+29
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | am 07574544: 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
| |/ / /
* | | | am cae00fcc: Merge "Remove last user of <cutils/tztime.h>."Elliott Hughes2014-07-242-4/+2
|\ \ \ \ | |/ / /
| * | | 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
| * | | | stagefright: Fix seeking in MPEG4 container - do not mergeLajos Molnar2014-07-224-120/+97
| |/ / /
* | | | am 2e25819f: Merge "M3UParser: check for NULL before setting meta data"Lajos Molnar2014-07-171-0/+6
|\ \ \ \ | |/ / /
| * | | M3UParser: check for NULL before setting meta dataRobert Shih2014-07-161-0/+6
* | | | am f839b8b4: Merge "Fix M3UParser relative path handling."Lajos Molnar2014-07-161-1/+3
|\ \ \ \ | |/ / /
| * | | Fix M3UParser relative path handling.Lajos Molnar2014-07-161-1/+3
* | | | am b7a88e31: Merge "h264_enc: Use free() to release memory allocated with mal...Narayan Kamath2014-07-141-2/+2
|\ \ \ \ | |/ / /
| * | | 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
| | | |/ | | |/|
* | | | am 0bffd2e6: Merge "Switch frameworks/av/media/libmedia to the new icu."Elliott Hughes2014-07-101-1/+1
|\ \ \ \ | |/ / /
| * | | 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
| | | |/ | | |/|
* | | | am c37eaa32: Merge "m4v_h263_enc: Use uint32_t for ULong"Narayan Kamath2014-07-094-7/+7
|\ \ \ \ | |/ / /
| * | | m4v_h263_enc: Use uint32_t for ULongAshok Bhat2014-07-024-7/+7
| |/ /
| * | DO NOT MERGE: Fix for SW video decoder OMX profile/level queryXiaosong Wei2014-06-241-3/+4
|/ /
* | libmediaplayerservice: unused argument warning messagesMark Salyzyn2014-06-244-29/+29
* | Fix buffer allocationMarco Nelissen2014-06-231-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
* | | Update OMX messages for 64 bitAndy Hung2014-06-129-148/+234
|/ /
* | Merge "Offer a type-safe album art interface."Elliott Hughes2014-06-114-23/+29
|\ \
| * | Offer a type-safe album art interface.Elliott Hughes2014-06-114-23/+29
* | | Add libcrypto for users of libstagefright.Christopher Ferris2014-06-102-3/+1
|/ /
* | Link libcrypto for MD5_* functions.Christopher Ferris2014-06-091-0/+7
|/
* Merge "Mp3decoder: Remove unused arm assembly files"Narayan Kamath2014-06-035-1413/+0
|\
| * Mp3decoder: Remove unused arm assembly filesAshok Bhat2014-05-275-1413/+0
* | am 2d0e8d8f: Merge "libcpustats: Turn on -Werror"Mark Salyzyn2014-05-302-3/+4
|\ \