summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs
Commit message (Expand)AuthorAgeFilesLines
* am 3e08ca67: resolved conflicts for merge of 6571ed31 to lmp-mr1-dev-plus-aospLajos Molnar2014-12-1111-964/+177
|\
| * resolved conflicts for merge of 6571ed31 to lmp-mr1-dev-plus-aospLajos Molnar2014-12-1111-964/+177
| |\
| | * stagefright: misc fixes to software video encoders (and decoders)Lajos Molnar2014-12-1011-964/+176
| | * Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitionsBernhard Rosenkränzer2014-12-092-3/+3
* | | am 33cc5c91: am f143b608: am d1aeff55: Merge "Fix build with clang in C++11 m...Lajos Molnar2014-12-0935-95/+95
|\ \ \ | |/ /
| * | am f143b608: am d1aeff55: Merge "Fix build with clang in C++11 mode"Lajos Molnar2014-12-0935-95/+95
| |\ \
| | * \ Merge "Fix build with clang in C++11 mode"Lajos Molnar2014-12-0935-95/+95
| | |\ \
| | | * | Fix build with clang in C++11 modeBernhard Rosenkränzer2014-11-2735-95/+95
* | | | | am 853bc5a2: am f3c25346: am 66172f5c: Merge "Cast int64_t values to long lon...Lajos Molnar2014-12-091-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | am f3c25346: am 66172f5c: Merge "Cast int64_t values to long long before print."Lajos Molnar2014-12-091-2/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge "Cast int64_t values to long long before print."Lajos Molnar2014-12-091-2/+2
| | |\ \ \
| | | * | | Cast int64_t values to long long before print.Bernhard Rosenkränzer2014-12-041-2/+2
| | | |/ /
* | | | | am 80ddb730: am ce48b3a8: am f3df58c7: Merge "Stagefright: Fix unused variables"Andreas Gampe2014-12-092-4/+1
|\ \ \ \ \ | |/ / / /
| * | | | am ce48b3a8: am f3df58c7: Merge "Stagefright: Fix unused variables"Andreas Gampe2014-12-092-4/+1
| |\ \ \ \ | | |/ / /
| | * | | Stagefright: Fix unused variablesAndreas Gampe2014-12-042-4/+1
| | |/ /
* | | | stagefright: support VP9 frame parallel decode in Soft VPXhkuang2014-12-052-66/+179
|/ / /
* | | resolved conflicts for merge of e5ba80c5 to lmp-mr1-dev-plus-aospAndreas Gampe2014-11-2723-113/+24
|\ \ \ | |/ /
| * | Merge "Stagefright: Fix unused variables, functions, values"Andreas Gampe2014-11-2623-116/+24
| |\ \
| | * | Stagefright: Fix unused variables, functions, valuesAndreas Gampe2014-11-2523-116/+24
* | | | am e464018a: am f59eae94: Merge "Fix overload of SoftVideoDecoderOMXComponent...Chih-hung Hsieh2014-11-252-3/+3
|\ \ \ \ | |/ / /
| * | | Merge "Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions"Chih-hung Hsieh2014-11-252-3/+3
| |\ \ \
| | * | | Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitionsBernhard Rosenkränzer2014-11-202-3/+3
* | | | | am 7fca411f: am b44760cf: Merge "Remove deprecated register keyword"Chih-hung Hsieh2014-11-251-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Remove deprecated register keywordBernhard Rosenkränzer2014-11-251-1/+1
* | | | | am 112ba592: am 6c7d332f: Merge "Remove bogus forward declarations"Chih-hung Hsieh2014-11-252-4/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Remove bogus forward declarations"Chih-hung Hsieh2014-11-242-4/+0
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Remove bogus forward declarationsBernhard Rosenkränzer2014-11-202-4/+0
| | |/ /
* | | | am 128b7850: am db1ce33e: Merge "Remove check for an impossible condition"Chih-hung Hsieh2014-11-251-4/+0
|\ \ \ \ | |/ / /
| * | | Merge "Remove check for an impossible condition"Chih-hung Hsieh2014-11-241-4/+0
| |\ \ \
| | * | | Remove check for an impossible conditionBernhard Rosenkraenzer2014-10-041-4/+0
* | | | | am d6048672: am 9d2e0dae: Merge "Remove extraneous parentheses"Chih-hung Hsieh2014-11-201-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Remove extraneous parenthesesBernhard Rosenkränzer2014-11-201-1/+1
| | |/ / | |/| |
* | | | am 5f3eef9a: am 7a200235: Merge "Remove extraneous parentheses"Chih-hung Hsieh2014-11-182-2/+2
|\ \ \ \ | |/ / /
| * | | Remove extraneous parenthesesBernhard Rosenkränzer2014-11-182-2/+2
* | | | am eb0827f3: am c5160b34: Merge "Remove the executable bit from source files"Glenn Kasten2014-11-1091-0/+0
|\ \ \ \ | |/ / /
| * | | Remove the executable bit from source filesMartin Storsjo2014-11-0791-0/+0
| * | | am 8a8f2fdc: am 589a89f5: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-161-0/+2
| |\ \ \
| * \ \ \ resolved conflicts for merge of 2edda09a to lmp-dev-plus-aospLajos Molnar2014-10-147-362/+70
| |\ \ \ \
| * \ \ \ \ am 801a3ff8: Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat...Chong Zhang2014-10-131-1/+8
| |\ \ \ \ \
| * \ \ \ \ \ am 5002d02e: Merge "Recover from errors" into lmp-devMarco Nelissen2014-10-071-5/+14
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am 566a6fba: am ae38d425: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-061-0/+3
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am b220fe0e: Merge "stagefright: fix fake-stride handling for H263 SW decoder...Ronghua Wu2014-10-031-2/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am d0b9efe7: Merge "add AAC audio decoder params for PCM limiter enable" into...Chong Zhang2014-10-011-0/+4
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am ea55da94: Merge "Fix SoftAAC2 flush" into lmp-devMarco Nelissen2014-09-251-4/+8
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am cae1c0fa: Merge "stagefright: fix cropping handling for SoftAVC and SoftME...Ronghua Wu2014-09-253-15/+21
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am 80ec934a: Merge "stagefright: add adaptive playback support to SoftHEVC de...Ronghua Wu2014-09-242-80/+125
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am 4409ba46: Merge "Fix ringbuffer handling" into lmp-devMarco Nelissen2014-09-192-24/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am b0ed4e3e: Merge "Always consider first buffer to be config" into lmp-devMarco Nelissen2014-09-191-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 999b888f: Merge "Fix null pointer dereference" into lmp-devMarco Nelissen2014-09-171-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "libstagefright: set actual stride info for SW encoder input port" into...Lajos Molnar2014-10-283-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |