summaryrefslogtreecommitdiffstats
path: root/media
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
| |\
| | * libeffects: don't set module pathColin Cross2014-02-131-1/+0
| * | am af191eb4: Merge "Replace size_t in shared memory by uint32_t"Glenn Kasten2014-02-131-6/+13
| |\ \ | | |/
| | * Replace size_t in shared memory by uint32_tGlenn Kasten2014-02-131-6/+13
* | | Merge "Track pid for each session"Marco Nelissen2014-02-137-27/+49
|\ \ \
| * | | Track pid for each sessionMarco Nelissen2014-02-117-27/+49
* | | | Remove unused FragmentedMP4Parser and friends. The functionality has beenAndreas Huber2014-02-139-2986/+1
* | | | 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 "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-113-7/+9
|/ / / / / /
* | | | | | 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-11122-207/+446
|\ \ \ \ \ \ \
| * | | | | | | warnings be gone.Andreas Huber2014-02-11122-207/+446
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge "Support "data:" URIs again in mediaplayer..."Andreas Huber2014-02-114-1/+118
|\ \ \ \ \ \ \
| * | | | | | | Support "data:" URIs again in mediaplayer...Andreas Huber2014-02-114-1/+118
| |/ / / / / /
* | | | | | | 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-1130-94/+104
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | / / | |_|_|_|/ / |/| | | | |
| * | | | | am 3c9130a8: Merge "Make frameworks/av 64-bit compatible"Narayan Kamath2014-02-1130-95/+105
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Make frameworks/av 64-bit compatibleKévin PETIT2014-02-1130-95/+105
| | | |/ / | | |/| |
* | | | | Fix build after merge from AOSPGlenn Kasten2014-02-101-8/+4
* | | | | am 4e12dade: am 4361749d: Merge "AudioTrack: Never try to use the fast path i...Glenn Kasten2014-02-101-0/+6
|\ \ \ \ \ | |/ / / /
| * | | | am 4361749d: Merge "AudioTrack: Never try to use the fast path if resampling ...Glenn Kasten2014-02-101-0/+6
| |\ \ \ \ | | |/ / /
| | * | | Merge "AudioTrack: Never try to use the fast path if resampling is required"Glenn Kasten2014-02-101-0/+6
| | |\ \ \
| | | * | | AudioTrack: Never try to use the fast path if resampling is requiredMartin Storsjo2014-01-311-0/+6
* | | | | | Merge "Fix regression"Marco Nelissen2014-02-101-1/+1
|\ \ \ \ \ \
| * | | | | | Fix regressionMarco Nelissen2014-02-101-1/+1
* | | | | | | am af8a3e29: am 7142d10a: Merge "avcenc: Update video port parameters in the ...Lajos Molnar2014-02-101-0/+11
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am 7142d10a: Merge "avcenc: Update video port parameters in the base class"Lajos Molnar2014-02-101-0/+11
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge "avcenc: Update video port parameters in the base class"Lajos Molnar2014-02-101-0/+11
| | |\ \ \ \ \
| | | * | | | | avcenc: Update video port parameters in the base classMartin Storsjo2013-11-211-0/+11
| * | | | | | | am 61bdaaa1: Merge "ChromiumHTTPDataSource: Keep track of the redirected URL"Lajos Molnar2014-02-103-0/+7
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "ChromiumHTTPDataSource: Keep track of the redirected URL"Lajos Molnar2014-02-103-0/+7
| | |\ \ \ \ \ \
| | | * | | | | | ChromiumHTTPDataSource: Keep track of the redirected URLMartin Storsjo2013-11-253-0/+7
* | | | | | | | | am 25da2f09: am 88e99f9a: Merge "SoftVPXEncoder: Set the frame size on the ou...Lajos Molnar2014-02-101-0/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 88e99f9a: Merge "SoftVPXEncoder: Set the frame size on the output port as ...Lajos Molnar2014-02-101-0/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /