summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Expand)AuthorAgeFilesLines
* Merge "Remove bogus forward declarations"Chih-hung Hsieh2014-11-242-4/+0
|\
| * Remove bogus forward declarationsBernhard Rosenkränzer2014-11-202-4/+0
* | Stagefright: Fix default typoAndreas Gampe2014-11-241-2/+2
* | 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
* | | Merge "C++11 compatibility."Dan Albert2014-11-201-4/+4
|\ \ \
| * | | C++11 compatibility.Dan Albert2014-11-201-4/+4
| | |/ | |/|
* | | Remove extraneous parenthesesBernhard Rosenkränzer2014-11-201-1/+1
|/ /
* | Merge "Remove extraneous parentheses"Chih-hung Hsieh2014-11-182-2/+2
|\ \
| * | Remove extraneous parenthesesBernhard Rosenkränzer2014-11-182-2/+2
* | | Fix uninitialized variableBernhard Rosenkränzer2014-11-181-1/+1
|/ /
* | Fix struct vs. class mismatchesBernhard Rosenkränzer2014-11-179-11/+11
* | Update calls to IInterface::asBinder()Marco Nelissen2014-11-175-11/+11
* | libstagefright: use __predict_false from bionic rather than CONDITION from lo...Mark Salyzyn2014-11-111-1/+1
* | 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
|\ \
| * \ am 589a89f5: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-161-0/+2
| |\ \
| | * | Add -no-integrated-as at local level.Chih-Hung Hsieh2014-10-161-0/+2
* | | | am c40da54b: Merge "Fix freed memory references" into lmp-devLajos Molnar2014-10-161-3/+8
|\ \ \ \
| * \ \ \ Merge "Fix freed memory references" into lmp-devLajos Molnar2014-10-161-3/+8
| |\ \ \ \
| | * | | | Fix freed memory referencesMarco Nelissen2014-10-161-3/+8
* | | | | | am 447898bc: Merge "ACodec: only check crop rect on output port" into lmp-devLajos Molnar2014-10-141-2/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "ACodec: only check crop rect on output port" into lmp-devLajos Molnar2014-10-141-2/+10
| |\ \ \ \ \
| | * | | | | ACodec: only check crop rect on output portLajos Molnar2014-10-071-2/+10
* | | | | | | resolved conflicts for merge of 2edda09a to lmp-dev-plus-aospLajos Molnar2014-10-1410-362/+454
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | stagefright: fix surface input handling of software encodersLajos Molnar2014-10-1310-349/+456
* | | | | | | am 512e9792: stagefright: support passing GraphicBuffer in metadata bufferLajos Molnar2014-10-144-21/+75
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | stagefright: support passing GraphicBuffer in metadata bufferLajos Molnar2014-10-134-21/+75
* | | | | | | am 801a3ff8: Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat...Chong Zhang2014-10-132-1/+34
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-devChong Zhang2014-10-132-1/+34
| |\ \ \ \ \ \
| | * | | | | | handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormatChong Zhang2014-10-132-1/+34
| | | |/ / / / | | |/| | | |
* | | | | | | am 7225187b: Merge "ACodec: process deferred messages when entering Loaded st...Wei Jia2014-10-131-0/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "ACodec: process deferred messages when entering Loaded state." into lm...Wei Jia2014-10-131-0/+2
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | ACodec: process deferred messages when entering Loaded state.Wei Jia2014-10-101-0/+2
* | | | | | | am 380757ba: Merge "Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPo...Guang Zhu2014-10-131-21/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"" in...Guang Zhu2014-10-131-21/+0
| |\ \ \ \ \ \
| | * | | | | | Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"Guang Zhu2014-10-131-21/+0
* | | | | | | | am aec1dbfd: Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat...Chong Zhang2014-10-101-0/+21
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-devChong Zhang2014-10-101-0/+21
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormatChong Zhang2014-10-091-0/+21
| | | |/ / / / | | |/| | | |
* | | | | | | am a4c3d8f0: Merge "MediaCodec: fix onError and onInputBufferAvailable" into ...Lajos Molnar2014-10-101-9/+15
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | MediaCodec: fix onError and onInputBufferAvailableLajos Molnar2014-10-091-9/+15
| |/ / / / /
* | | | | | am 5002d02e: Merge "Recover from errors" into lmp-devMarco Nelissen2014-10-071-5/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Recover from errors" into lmp-devMarco Nelissen2014-10-071-5/+14
| |\ \ \ \ \
| | * | | | | Recover from errorsMarco Nelissen2014-10-061-5/+14
* | | | | | | am 584c14c3: Merge "stagefright: do not allocate output buffers for tunneled ...Rachad2014-10-071-1/+28
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "stagefright: do not allocate output buffers for tunneled playback" int...Rachad2014-10-071-1/+28
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | stagefright: do not allocate output buffers for tunneled playbackRachad2014-09-281-1/+28
* | | | | | | am 566a6fba: am ae38d425: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-061-0/+3
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | am ae38d425: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-061-0/+3
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |