summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs/common
Commit message (Collapse)AuthorAgeFilesLines
* stagefright aacenc/amrwbenc: Remove trailing whitespaceMans Rullgard2012-01-124-14/+14
| | | | | | | | | | | | | | This was applied in AOSP master earlier, in commit b21611e5b0f1797e39e781d91ade023bac87637f, but when merged into the Google internal tree in 88c2d4d26d79384f32a25bd775cf873cb678b12a, none of these changes have been brought in. (The diff of this merge commit and its first parent, d94b71d, is empty.) Therefore, reapply the rest of these changes on the files that still are present in the current version. Change-Id: I645a9b9134769958a11808a06163123d28d83e46
* am 3ab6ccda: am 2acddc54: am 89bac182: am 88409911: Merge "stagefright: ↵Deckard Autoverifier2011-07-181-3/+1
|\ | | | | | | | | | | | | Include stdlib.h for malloc/free" * commit '3ab6ccda447c605c35c8854a2ec8c49c2a0653a6': stagefright: Include stdlib.h for malloc/free
| * Merge "stagefright: Include stdlib.h for malloc/free"Deckard Autoverifier2011-07-181-3/+1
| |\
| | * stagefright: Include stdlib.h for malloc/freeMartin Storsjo2011-06-221-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to ANSI C, malloc/free are provided by stdlib.h. Also, string.h is always available according to ANSI C, and provides the memset function, so there's no need to include it conditionally for linux only. This makes the code buildable on OS X, too. Change-Id: Ie5d1da02158797e7e45dea257cbe3e4996dde4db
* | | am b7f0d825: am 691257b1: am 68e37dac: am 55f115a3: Merge "stagefright: Only ↵Deckard Autoverifier2011-07-181-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | use __int64 on MSVC, not on all win32 compilers" * commit 'b7f0d825c56dced10bb7df7cfc624ef9ebffe21c': stagefright: Only use __int64 on MSVC, not on all win32 compilers
| * | Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"Deckard Autoverifier2011-07-181-1/+1
| |\ \
| | * | stagefright: Only use __int64 on MSVC, not on all win32 compilersMartin Storsjo2011-06-221-1/+1
| | |/ | | | | | | | | | Change-Id: I9eef7e1cb762753b792ab602333dc5a2fd8a173c
| * | stagefright aacenc/amrwbenc: Remove trailing whitespaceMans Rullgard2011-04-234-14/+14
| |/ | | | | | | Change-Id: I3c85d8ba4cfb164455d137cdbf3b5ecc941dc6b8
| * stagefright aacenc/amrwbenc: Convert line breaks to Unix styleMans Rullgard2011-04-238-951/+951
| | | | | | | | Change-Id: I6219725a9fbd72432bad71a176c14f26fabdbd5f
* | Convert line breaks to Unix styleMans Rullgard2011-05-218-951/+951
| | | | | | | | Change-Id: I6219725a9fbd72432bad71a176c14f26fabdbd5f
* | frameworks/base: remove LOCAL_PRELINK_MODULEIliyan Malchev2011-03-141-1/+1
|/ | | | | Change-Id: I54dd62ebef47e7690afa5a858f3cad941b135481 Signed-off-by: Iliyan Malchev <malchev@google.com>
* Initial software encoder checkinsJames Dong2010-05-1910-0/+1049
Change-Id: I27f387db23594e46384c4eb3a0093ce220bb6b60