summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix Externally reported security issueJeff Tinker2014-07-111-1/+12
| | | | | bug: 12724697 Change-Id: I57f37dbb3b01c0c3d3256be67c395352dd6ada13
* 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
| | | | | | | | Change-Id: I45349756bac6d89b02dba082ba6d606f4c489dcf
* | 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
|/ | | | | | | | | | | | | ULong is used in the encoder code as 32-bit unsigned integer type. But it has been defined as an unsigned long, which will be 64-bit on 64-bit platforms. This causes many problems including output mismatch between 32-bit and 64-bit code and crash in certain cases. This patch defines ULong as uint32_t. In addition, it uses uintptr_t at places where an address is cast to an integer to check for alignment. Change-Id: I2b0086824a5985b9fc4628ce6fbe81db156e37d2 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* 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
|/ | | | | | | | | get the correct profile index from the input param and pass it to profileLevel array to get the corresponding profile/level Change-Id: I582961c0afb53c1781af7fb94226a23e5fdb96cf Signed-off-by: Xiaosong Wei <xiaosong.wei@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com>
* Merge "libmediaplayerservice: unused argument warning messages"Mark Salyzyn2014-06-234-29/+29
|\
| * libmediaplayerservice: unused argument warning messagesMark Salyzyn2014-06-244-29/+29
|/ | | | Change-Id: I7dbf62858114ac9b8de6d7b66cc00e002769a5cf
* Merge "Fix buffer allocation"Marco Nelissen2014-06-201-1/+1
|\
| * Fix buffer allocationMarco Nelissen2014-06-231-1/+1
|/ | | | | | b/15293123 Change-Id: Icb3ceabf02a55bc931baaf388ce125db6332de0e
* 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
| | | | | | | | | | Bug: 15514223 Change-Id: I895ea8ef7e391fd14cdf8976e048385e01c90f8f
* | 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
| |/ | | | | | | | | | | | | | | | | bug: 15424960 bug: 15107693 (cherry picked from commit bcca9e072c1f288a53ce6862936f57dc36488f96) Change-Id: I3ba59fccb184e99a07f6f82ccdbd00e5204901f6
* | Merge "Update OMX messages for 64 bit"Narayan Kamath2014-06-1111-151/+237
|\ \ | |/ |/|
| * Update OMX messages for 64 bitAndy Hung2014-06-1211-151/+237
|/ | | | | | | | | Change node_id and buffer_id to uint32_t. Ensure IOMX messages are fixed size. Remove 64 bit compile warnings in associated files. Change-Id: Icdbef00aca575e5dc502ebb52e3ce7d0d7883203 Signed-off-by: Andy Hung <hunga@google.com>
* Merge "Offer a type-safe album art interface."Elliott Hughes2014-06-118-84/+57
|\
| * Offer a type-safe album art interface.Elliott Hughes2014-06-118-84/+57
| | | | | | | | | | Bug: 15514223 Change-Id: Iddfc33a00e6cd3779ca09c01a55f62b151f6ec95
* | Merge "Add libcrypto for users of libstagefright."Christopher Ferris2014-06-102-3/+1
|\ \ | |/ |/|
| * Add libcrypto for users of libstagefright.Christopher Ferris2014-06-102-3/+1
|/ | | | | | | | | | libstagefright_rtsp uses some MD5 functions that used to be in bionic, but it was removed recently. As an initial fix, I statically linked in libcrypto_static to the libstagefright_rtsp library. However, I think it's better to modify the single user of this library to link against the shared libcrypto library. Change-Id: Iaf2e1aeea32fd8af038f6e77bf58ea7df50d807a
* Merge "Link libcrypto for MD5_* functions."Christopher Ferris2014-06-101-0/+7
|\
| * Link libcrypto for MD5_* functions.Christopher Ferris2014-06-091-0/+7
|/ | | | Change-Id: I5dce8f041b9faf035161b82d5e46bd46166bd05c
* Merge "libcamera_client: 64-bit compile issue"Mark Salyzyn2014-06-092-4/+4
|\
| * libcamera_client: 64-bit compile issueMark Salyzyn2014-06-092-4/+4
|/ | | | | | | - size_t print format - some unused parameter warning messages Change-Id: I2c0f50dda7e810f3f60603fd9d8c62c5b8767528
* Merge "Mp3decoder: Remove unused arm assembly files"Narayan Kamath2014-06-035-1413/+0
|\
| * Mp3decoder: Remove unused arm assembly filesAshok Bhat2014-05-275-1413/+0
| | | | | | | | | | | | | | | | | | The unused ARM assembly files were written for legacy proprietary ARM compilers. They are not needed when gcc or clang compiler is used. Change-Id: I8dfe9ad458efbb34922094e943ad334cc34f59a3 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
* | am 2d0e8d8f: Merge "libcpustats: Turn on -Werror"Mark Salyzyn2014-05-302-3/+4
|\ \ | | | | | | | | | | | | * commit '2d0e8d8f75369b491362f2ea3a6efd5159df404c': libcpustats: Turn on -Werror
| * \ Merge "libcpustats: Turn on -Werror"Mark Salyzyn2014-05-302-3/+4
| |\ \
| | * | libcpustats: Turn on -WerrorMark Salyzyn2014-05-302-3/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | - Switch to static_assert from deprecated utils/Debug.h - Turn on C++11 standard - Turn on -Werror Change-Id: I4f1c08bbcaf1ad3a97502cde756a2f42bcece789
* | | am df9b1ff3: Merge "Move to dalvik.vm.lib.2 to force default to libart"Brian Carlstrom2014-05-281-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit 'df9b1ff3726e263c8533add096435520ca4b7d61': Move to dalvik.vm.lib.2 to force default to libart
| * | Merge "Move to dalvik.vm.lib.2 to force default to libart"Brian Carlstrom2014-05-281-1/+1
| |\ \ | | |/ | |/|
| | * Move to dalvik.vm.lib.2 to force default to libartBrian Carlstrom2014-05-281-1/+1
| |/ | | | | | | | | | | | | | | Bug: 14298175 (cherry picked from commit 483f59ab9fb4b2d8ab212f77a50eed0528beca58) Change-Id: I387af6e4721840f98063f26854c02e6da26b9974
* | am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."Elliott Hughes2014-05-222-4/+2
|\ \ | |/ | | | | | | * commit '8b187f4acea8d7e517ff9ced32fc7368bdbaa6e0': Move frameworks/av off <sys/atomics.h>.
| * Merge "Move frameworks/av off <sys/atomics.h>."Elliott Hughes2014-05-222-4/+2
| |\
| | * Move frameworks/av off <sys/atomics.h>.Elliott Hughes2014-05-222-4/+2
| |/ | | | | | | | | Bug: 14903517 Change-Id: I92cdfc618d83fd914cfb558a07b1deae0255fccb
* | am d5516339: Merge "Move frameworks/av from fdprintf to POSIX dprintf."Calin Juravle2014-05-228-39/+39
|\ \ | |/ | | | | | | * commit 'd551633916d3677da4dda10aba6837bdc6803ee0': Move frameworks/av from fdprintf to POSIX dprintf.
| * Merge "Move frameworks/av from fdprintf to POSIX dprintf."Calin Juravle2014-05-228-39/+39
| |\
| | * Move frameworks/av from fdprintf to POSIX dprintf.Elliott Hughes2014-05-228-39/+39
| |/ | | | | | | | | Bug: 11156955 Change-Id: Ia98cd16b4c1f7be87cf060b7456de4f40896bacb
* | am 85e6e87c: Merge "Restore accidentally-removed NULL timeout."Elliott Hughes2014-05-221-1/+1
|\ \ | |/ | | | | | | * commit '85e6e87c41bba51729cee8958a5c30157c8dc674': Restore accidentally-removed NULL timeout.
| * Merge "Restore accidentally-removed NULL timeout."Elliott Hughes2014-05-221-1/+1
| |\
| | * Restore accidentally-removed NULL timeout.Elliott Hughes2014-05-211-1/+1
| |/ | | | | | | Change-Id: I933c80fea50950243f109acf8d6350013aaa811f
* | am 3b6da6bf: Merge "Move frameworks/av off private API."Elliott Hughes2014-05-225-39/+39
|\ \ | |/ | | | | | | * commit '3b6da6bfb50a1c0324fb4c87326d3a477944d5fe': Move frameworks/av off private API.
| * Merge "Move frameworks/av off private API."Elliott Hughes2014-05-225-39/+39
| |\
| | * Move frameworks/av off private API.Elliott Hughes2014-05-215-39/+39
| |/ | | | | | | | | Bug: 11156955 Change-Id: Ib3bb9d66a2bf92977c2445b62aa074a2d7a45aea
* | am d084206d: Merge "Move frameworks/av off __futex_syscall3."Elliott Hughes2014-05-223-14/+14
|\ \ | |/ | | | | | | * commit 'd084206d5a4a5364211af46e4201311933e83bfc': Move frameworks/av off __futex_syscall3.
| * Merge "Move frameworks/av off __futex_syscall3."Elliott Hughes2014-05-223-14/+14
| |\
| | * Move frameworks/av off __futex_syscall3.Elliott Hughes2014-05-213-14/+14
| |/ | | | | | | | | Bug: 11156955 Change-Id: I943080bc51b6efa781059b48b5b5ecc4fa287512
* | am ce473c32: Merge "Codec Offload: Add NULL check as mCallbackThread is NULL ↵Eric Laurent2014-05-191-1/+4
|\ \ | |/ | | | | | | | | | | when offloaded HAL is running BLOCKING mode" * commit 'ce473c32705e2d1c5fcc817198101e1220b3c8f7': Codec Offload: Add NULL check as mCallbackThread is NULL when offloaded HAL is running BLOCKING mode
| * Merge "Codec Offload: Add NULL check as mCallbackThread is NULL when ↵Eric Laurent2014-05-191-1/+4
| |\ | | | | | | | | | offloaded HAL is running BLOCKING mode"
generated by cgit v1.1 at 2024-09-22 03:58:27 +0000