summaryrefslogtreecommitdiffstats
path: root/media
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 in SoftAVCEncoder plugin"Narayan Kamath2014-09-041-3/+4
|\ \
| * | Fix in SoftAVCEncoder pluginAshok Bhat2014-07-091-3/+4
* | | Move chromium_http/support.cpp off androidGetTid.Elliott Hughes2014-08-181-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
* | | | Fix build after side-stepping global -Bsymbolic.Dan Albert2014-08-073-0/+25
|/ / /
* | | 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
|/ / /
* | | M3UParser: check for NULL before setting meta dataRobert Shih2014-07-161-0/+6
* | | Fix M3UParser relative path handling.Lajos Molnar2014-07-161-1/+3
* | | 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
| | |/ | |/|
* | | 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
|\ \
| * | libcpustats: Turn on -WerrorMark Salyzyn2014-05-302-3/+4
| |/
* | am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."Elliott Hughes2014-05-221-3/+2
|\ \ | |/
| * Move frameworks/av off <sys/atomics.h>.Elliott Hughes2014-05-221-3/+2
* | am d5516339: Merge "Move frameworks/av from fdprintf to POSIX dprintf."Calin Juravle2014-05-221-1/+1
|\ \ | |/
| * Move frameworks/av from fdprintf to POSIX dprintf.Elliott Hughes2014-05-221-1/+1
* | am 3b6da6bf: Merge "Move frameworks/av off private API."Elliott Hughes2014-05-221-31/+31
|\ \ | |/
| * Move frameworks/av off private API.Elliott Hughes2014-05-211-31/+31
* | am d084206d: Merge "Move frameworks/av off __futex_syscall3."Elliott Hughes2014-05-221-10/+10
|\ \ | |/
| * Move frameworks/av off __futex_syscall3.Elliott Hughes2014-05-211-10/+10
* | am 3059e27d: Merge "libstagefright foundation: fix uninitialized varibale war...Andreas Huber2014-05-161-1/+1
|\ \ | |/
| * libstagefright foundation: fix uninitialized varibale warningAmit Pundir2014-05-151-1/+1
* | am b2314088: Merge "AwesomePlayer: use PTS for queueBuffer"Lajos Molnar2014-05-021-7/+10
|\ \ | |/
| * Merge "AwesomePlayer: use PTS for queueBuffer"Lajos Molnar2014-05-021-7/+10
| |\
| | * AwesomePlayer: use PTS for queueBufferLajos Molnar2014-05-011-7/+10
* | | am b52675e9: Merge "Smooth out AwesomePlayer"Lajos Molnar2014-05-022-4/+25
|\ \ \ | |/ /