summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs/avc
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r46' into HEADJessica Wagantall2016-06-071-0/+16
|\
| * DO NOT MERGE Verify OMX buffer sizes prior to accessMarco Nelissen2016-04-211-0/+16
* | Stagefright: Remove unused variables and filesAndreas Gampe2016-03-221-13/+0
|/
* am 051b8572: am 91860b89: SoftAVCEncoder: fix auto merge error, member names ...Wei Jia2015-08-201-1/+1
|\
| * SoftAVCEncoder: fix auto merge error, member names have changed.Wei Jia2015-08-171-1/+1
* | am e264b770: am d9d6c465: am 5d1e62e2: am 9cebcc5f: Merge "SoftAVCEncoder: fi...Wei Jia2015-08-201-1/+1
|\ \ | |/
| * am 5d1e62e2: am 9cebcc5f: Merge "SoftAVCEncoder: fix mismatched type for comp...Wei Jia2015-08-181-1/+1
| |\
| | * SoftAVCEncoder: fix mismatched type for comparison.Wei Jia2015-08-171-1/+1
* | | am 50b600d6: am ab33de61: am 78df80c2: am 65842db0: Merge commit \'b46eb8d9\'...Wei Jia2015-08-201-0/+8
|\ \ \ | |/ /
| * | am 78df80c2: am 65842db0: Merge commit \'b46eb8d9\' into HEADWei Jia2015-08-181-0/+8
| |\ \ | | |/
| | * Merge commit 'b46eb8d9' into HEADWei Jia2015-08-171-0/+8
| | |\
| | | * am 479b4de0: SoftAVCEnc: check requested memory size before allocation.Wei Jia2015-08-181-0/+12
| | | |\
| | | | * SoftAVCEnc: check requested memory size before allocation.Wei Jia2015-08-141-0/+12
| | | | * Add liblogYing Wang2013-04-091-0/+1
| | | | * am a923dd4e: am 1b0ae9e4: Merge "avcenc: Set OMX_BUFFERFLAG_EOS on the last o...Jean-Baptiste Queru2012-09-121-0/+3
| | | | |\
| | | | * \ am bf30787f: am 735d1b92: Merge "avcenc: Don\'t erase the InputBufferInfo bef...Jean-Baptiste Queru2012-08-291-1/+1
| | | | |\ \
* | | | | \ \ resolved conflicts for merge of 6571ed31 to lmp-mr1-dev-plus-aospLajos Molnar2014-12-112-299/+59
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | stagefright: misc fixes to software video encoders (and decoders)Lajos Molnar2014-12-102-299/+59
* | | | | | | am f143b608: am d1aeff55: Merge "Fix build with clang in C++11 mode"Lajos Molnar2014-12-091-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix build with clang in C++11 modeBernhard Rosenkränzer2014-11-271-1/+1
* | | | | | | | resolved conflicts for merge of e5ba80c5 to lmp-mr1-dev-plus-aospAndreas Gampe2014-11-273-5/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Stagefright: Fix unused variables, functions, values"Andreas Gampe2014-11-263-5/+3
| |\ \ \ \ \ \ \
| | * | | | | | | Stagefright: Fix unused variables, functions, valuesAndreas Gampe2014-11-253-5/+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-251-2/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Remove bogus forward declarations"Chih-hung Hsieh2014-11-241-2/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Remove bogus forward declarationsBernhard Rosenkränzer2014-11-201-2/+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
| * | | | | | | | resolved conflicts for merge of 2edda09a to lmp-dev-plus-aospLajos Molnar2014-10-142-113/+19
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
* | | | | | | | | Merge "libstagefright: set actual stride info for SW encoder input port" into...Lajos Molnar2014-10-281-0/+4
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | libstagefright: set actual stride info for SW encoder input portLajos Molnar2014-10-251-0/+4
| | |/ / / / / / | |/| | | | | |
* | | | | | | | resolved conflicts for merge of f4147ee9 to lmp-mr1-dev-plus-aospLajos Molnar2014-10-142-113/+19
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | / / / / / / | |/ / / / / / |/| | | | | |
| * | | | | | stagefright: fix surface input handling of software encodersLajos Molnar2014-10-132-107/+21
* | | | | | | am 13006b9d: am 032ecb7f: Merge "Fix in SoftAVCEncoder plugin"Narayan Kamath2014-09-041-3/+4
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge "Fix in SoftAVCEncoder plugin"Narayan Kamath2014-09-041-3/+4
| |\ \ \ \ \ \
| | * | | | | | Fix in SoftAVCEncoder pluginAshok Bhat2014-07-091-3/+4
* | | | | | | | am e4478feb: Merge "Add adaptive playback support to VPX decoder." into lmp-devRonghua Wu2014-09-021-4/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Add adaptive playback support to VPX decoder.Ronghua Wu2014-08-281-4/+0
* | | | | | | | am 24a5a7c3: am b7a88e31: Merge "h264_enc: Use free() to release memory alloc...Narayan Kamath2014-07-141-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | | | | h264_enc: Use free() to release memory allocated with malloc()Ashok Bhat2014-06-251-2/+2
| |/ / / / /
| * | | | | media: memset sizeof argument issuesMark Salyzyn2014-04-111-1/+1
* | | | | | Merge commit '52a23bd3' into manualmergeGlenn Kasten2014-04-031-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 64-bit: Correction to OMX_U32 and OMX_S32Glenn Kasten2014-04-021-2/+2
* | | | | | Merge commit 'c250980f' into manualmergeGlenn Kasten2014-03-191-2/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | libstagefright is no longer 32 bit only.Narayan Kamath2014-03-191-2/+0
* | | | | | resolved conflicts for merge of 3c780188 to masterGlenn Kasten2014-03-141-0/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | mediaserver and associated services are 32-bit onlyGlenn Kasten2014-03-121-0/+2