summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Skip scaling_list definitions in AVC seq header.Andreas Huber2014-02-141-1/+37
* am 8dad284a: am 80b72e6f: Merge "libeffects: don\'t set module path"Colin Cross2014-02-141-1/+0
|\
| * am 80b72e6f: Merge "libeffects: don\'t set module path"Colin Cross2014-02-141-1/+0
| |\
| | * Merge "libeffects: don't set module path"Colin Cross2014-02-141-1/+0
| | |\
| | | * libeffects: don't set module pathColin Cross2014-02-131-1/+0
| | |/
* | | Merge "Track pid for each session"Marco Nelissen2014-02-1312-41/+73
|\ \ \
| * | | Track pid for each sessionMarco Nelissen2014-02-1112-41/+73
* | | | Remove unused FragmentedMP4Parser and friends. The functionality has beenAndreas Huber2014-02-139-2986/+1
* | | | am 7a8e3146: am af191eb4: Merge "Replace size_t in shared memory by uint32_t"Glenn Kasten2014-02-130-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | am af191eb4: Merge "Replace size_t in shared memory by uint32_t"Glenn Kasten2014-02-133-12/+31
| |\ \ \ | | | |/ | | |/|
| | * | Merge "Replace size_t in shared memory by uint32_t"Glenn Kasten2014-02-133-12/+31
| | |\ \
| | | * | Replace size_t in shared memory by uint32_tGlenn Kasten2014-02-133-12/+31
| | |/ /
* | | | am 49960807: am 0105027f: Fix wrong channel table in ESQueue according to the...Dongwon Kang2014-02-131-1/+1
|\ \ \ \ | |/ / /
| * | | am 0105027f: Fix wrong channel table in ESQueue according to the A/52 table 5.8Dongwon Kang2014-02-131-1/+1
| |\ \ \
| | * | | Fix wrong channel table in ESQueue according to the A/52 table 5.8Dongwon Kang2014-02-111-1/+1
* | | | | Merge "Proper adjustment of filterlength for downsampling"Andy Hung2014-02-121-6/+14
|\ \ \ \ \
| * | | | | Proper adjustment of filterlength for downsamplingAndy Hung2014-02-111-6/+14
* | | | | | Merge "Even more warnings (now errors) fixed to unbreak the sdk-x86 build(s)."Andreas Huber2014-02-124-3/+6
|\ \ \ \ \ \
| * | | | | | Even more warnings (now errors) fixed to unbreak the sdk-x86 build(s).Andreas Huber2014-02-124-3/+6
* | | | | | | Merge "Fix warnings (now errors) in YUVImage.cpp"Andreas Huber2014-02-121-6/+6
|\ \ \ \ \ \ \
| * | | | | | | Fix warnings (now errors) in YUVImage.cppAndreas Huber2014-02-121-6/+6
| |/ / / / / /
* | | | | | | Merge "Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 byt...Rachad2014-02-121-3/+5
|\ \ \ \ \ \ \
| * | | | | | | Increased recorded MP4 max file size to 4GBRachad2014-02-101-3/+5
* | | | | | | | Merge "fix the OS X builds until we can fix compiler warnings that apparently"Andreas Huber2014-02-125-9/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | fix the OS X builds until we can fix compiler warnings that apparentlyAndreas Huber2014-02-115-9/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | fix the build by fixing more warnings.Andreas Huber2014-02-115-10/+12
|/ / / / / / /
* | | | | | | am 1c178d3e: am 7eacea11: Merge "avcenc: Only do startcode escaping if the ne...Lajos Molnar2014-02-111-6/+9
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | am 7eacea11: Merge "avcenc: Only do startcode escaping if the next byte requi...Lajos Molnar2014-02-111-6/+9
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge "avcenc: Only do startcode escaping if the next byte requires it"Lajos Molnar2014-02-111-6/+9
| | |\ \ \ \ \
| | | * | | | | avcenc: Only do startcode escaping if the next byte requires itMartin Storsjo2014-02-111-6/+9
* | | | | | | | Merge "warnings be gone."Andreas Huber2014-02-11123-208/+447
|\ \ \ \ \ \ \ \
| * | | | | | | | warnings be gone.Andreas Huber2014-02-11123-208/+447
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge "Support "data:" URIs again in mediaplayer..."Andreas Huber2014-02-115-1/+167
|\ \ \ \ \ \ \ \
| * | | | | | | | Support "data:" URIs again in mediaplayer...Andreas Huber2014-02-115-1/+167
| |/ / / / / / /
* | | | | | | | Merge "fix delay when shutting down wifi display"Chong Zhang2014-02-112-3/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | fix delay when shutting down wifi displayChong Zhang2014-02-072-3/+5
* | | | | | | | resolved conflicts for merge of 566be7c3 to masterNarayan Kamath2014-02-1159-191/+224
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | / / / | |_|_|_|/ / / |/| | | | | |
| * | | | | | am 3c9130a8: Merge "Make frameworks/av 64-bit compatible"Narayan Kamath2014-02-1159-187/+219
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge "Make frameworks/av 64-bit compatible"Narayan Kamath2014-02-1159-187/+219
| | |\ \ \ \ \
| | | * | | | | Make frameworks/av 64-bit compatibleKévin PETIT2014-02-1159-187/+219
| | |/ / / / /
* | | | | | | am 66e05682: am cdda7bf4: Merge "frameworks/av: fix errors inside ALOGV"Colin Cross2014-02-101-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am cdda7bf4: Merge "frameworks/av: fix errors inside ALOGV"Colin Cross2014-02-101-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "frameworks/av: fix errors inside ALOGV"Colin Cross2014-02-101-1/+1
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | frameworks/av: fix errors inside ALOGVColin Cross2014-02-101-1/+1
* | | | | | | Merge "Fix clang warnings in AudioFlinger"Glenn Kasten2014-02-1010-28/+31
|\ \ \ \ \ \ \
| * | | | | | | Fix clang warnings in AudioFlingerGlenn Kasten2014-02-1010-28/+31
* | | | | | | | Fix build after merge from AOSPGlenn Kasten2014-02-101-8/+4
* | | | | | | | am 5a458ede: am 5930e8eb: Merge "AudioFlinger: Remove code for supporting res...Glenn Kasten2014-02-104-26/+5
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am 5930e8eb: Merge "AudioFlinger: Remove code for supporting resampling in fa...Glenn Kasten2014-02-104-26/+5
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge "AudioFlinger: Remove code for supporting resampling in fast tracks"Glenn Kasten2014-02-104-26/+5
| | |\ \ \ \ \ \