summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Expand)AuthorAgeFilesLines
* Remove unused FragmentedMP4Parser and friends. The functionality has beenAndreas Huber2014-02-135-2778/+0
* 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-112-6/+8
|/ / / /
* | | | 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-11117-194/+431
|\ \ \ \ \ \
| * | | | | | warnings be gone.Andreas Huber2014-02-11117-194/+431
* | | | | | | 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-1118-57/+63
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | / / | |_|_|_|/ / |/| | | | |
| * | | | | am 3c9130a8: Merge "Make frameworks/av 64-bit compatible"Narayan Kamath2014-02-1118-57/+63
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Make frameworks/av 64-bit compatibleKévin PETIT2014-02-1118-57/+63
| | | |/ / | | |/| |
* | | | | 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
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "SoftVPXEncoder: Set the frame size on the output port as well"Lajos Molnar2014-02-101-0/+3
| | |\ \ \ \ \ \
| | | * | | | | | SoftVPXEncoder: Set the frame size on the output port as wellMartin Storsjo2013-11-251-0/+3
| | | |/ / / / /
| * | | | | | | am 44f2b8c2: Merge "M3UParser: Fix typo in 8883a38a308"Marco Nelissen2014-02-101-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | M3UParser: Fix typo in 8883a38a308Martin Storsjo2014-02-101-1/+1
* | | | | | | | Fix buildMarco Nelissen2014-02-101-1/+1
* | | | | | | | am 7cbaf3be: am 8519b8a1: Merge "M3UParser: Skip query strings when looking f...Marco Nelissen2014-02-101-12/+22
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | / / / | |_|_|_|/ / / |/| | | | | |
| * | | | | | am 8519b8a1: Merge "M3UParser: Skip query strings when looking for the last s...Marco Nelissen2014-02-101-12/+22
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "M3UParser: Skip query strings when looking for the last slash in a URL"Marco Nelissen2014-02-101-12/+22
| | |\ \ \ \ \
| | | * | | | | M3UParser: Skip query strings when looking for the last slash in a URLMartin Storsjo2014-02-051-12/+22
* | | | | | | | am 429f2bf7: am e2307ccb: Merge "frameworks/av: fix errors inside ALOGV"Colin Cross2014-02-102-1/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am e2307ccb: Merge "frameworks/av: fix errors inside ALOGV"Colin Cross2014-02-073-4/+3
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | frameworks/av: fix errors inside ALOGVColin Cross2014-02-063-4/+3
| | |/ / / / /
| * | | | | | am dd432ce0: [DO NOT MERGE] Support TS + AC3 for ATSC standardChangwan Ryu2014-02-045-0/+253
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |