Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | DO NOT MERGE Verify OMX buffer sizes prior to access | Marco Nelissen | 2016-04-21 | 1 | -0/+16 |
* | am 051b8572: am 91860b89: SoftAVCEncoder: fix auto merge error, member names ... | Wei Jia | 2015-08-20 | 1 | -1/+1 |
|\ | |||||
| * | SoftAVCEncoder: fix auto merge error, member names have changed. | Wei Jia | 2015-08-17 | 1 | -1/+1 |
* | | am e264b770: am d9d6c465: am 5d1e62e2: am 9cebcc5f: Merge "SoftAVCEncoder: fi... | Wei Jia | 2015-08-20 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | am 5d1e62e2: am 9cebcc5f: Merge "SoftAVCEncoder: fix mismatched type for comp... | Wei Jia | 2015-08-18 | 1 | -1/+1 |
| |\ | |||||
| | * | SoftAVCEncoder: fix mismatched type for comparison. | Wei Jia | 2015-08-17 | 1 | -1/+1 |
* | | | am 50b600d6: am ab33de61: am 78df80c2: am 65842db0: Merge commit \'b46eb8d9\'... | Wei Jia | 2015-08-20 | 1 | -0/+8 |
|\ \ \ | |/ / | |||||
| * | | am 78df80c2: am 65842db0: Merge commit \'b46eb8d9\' into HEAD | Wei Jia | 2015-08-18 | 1 | -0/+8 |
| |\ \ | | |/ | |||||
| | * | Merge commit 'b46eb8d9' into HEAD | Wei Jia | 2015-08-17 | 1 | -0/+8 |
| | |\ | |||||
| | | * | am 479b4de0: SoftAVCEnc: check requested memory size before allocation. | Wei Jia | 2015-08-18 | 1 | -0/+12 |
| | | |\ | |||||
| | | | * | SoftAVCEnc: check requested memory size before allocation. | Wei Jia | 2015-08-14 | 1 | -0/+12 |
| | | | * | Add liblog | Ying Wang | 2013-04-09 | 1 | -0/+1 |
| | | | * | am a923dd4e: am 1b0ae9e4: Merge "avcenc: Set OMX_BUFFERFLAG_EOS on the last o... | Jean-Baptiste Queru | 2012-09-12 | 1 | -0/+3 |
| | | | |\ | |||||
| | | | * \ | am bf30787f: am 735d1b92: Merge "avcenc: Don\'t erase the InputBufferInfo bef... | Jean-Baptiste Queru | 2012-08-29 | 1 | -1/+1 |
| | | | |\ \ | |||||
* | | | | \ \ | resolved conflicts for merge of 6571ed31 to lmp-mr1-dev-plus-aosp | Lajos Molnar | 2014-12-11 | 2 | -299/+59 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | stagefright: misc fixes to software video encoders (and decoders) | Lajos Molnar | 2014-12-10 | 2 | -299/+59 |
* | | | | | | | am f143b608: am d1aeff55: Merge "Fix build with clang in C++11 mode" | Lajos Molnar | 2014-12-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix build with clang in C++11 mode | Bernhard Rosenkränzer | 2014-11-27 | 1 | -1/+1 |
* | | | | | | | | resolved conflicts for merge of e5ba80c5 to lmp-mr1-dev-plus-aosp | Andreas Gampe | 2014-11-27 | 3 | -5/+3 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge "Stagefright: Fix unused variables, functions, values" | Andreas Gampe | 2014-11-26 | 3 | -5/+3 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Stagefright: Fix unused variables, functions, values | Andreas Gampe | 2014-11-25 | 3 | -5/+3 |
* | | | | | | | | | am 112ba592: am 6c7d332f: Merge "Remove bogus forward declarations" | Chih-hung Hsieh | 2014-11-25 | 1 | -2/+0 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge "Remove bogus forward declarations" | Chih-hung Hsieh | 2014-11-24 | 1 | -2/+0 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | Remove bogus forward declarations | Bernhard Rosenkränzer | 2014-11-20 | 1 | -2/+0 |
* | | | | | | | | | am 128b7850: am db1ce33e: Merge "Remove check for an impossible condition" | Chih-hung Hsieh | 2014-11-25 | 1 | -4/+0 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge "Remove check for an impossible condition" | Chih-hung Hsieh | 2014-11-24 | 1 | -4/+0 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | Remove check for an impossible condition | Bernhard Rosenkraenzer | 2014-10-04 | 1 | -4/+0 |
| * | | | | | | | | resolved conflicts for merge of 2edda09a to lmp-dev-plus-aosp | Lajos Molnar | 2014-10-14 | 2 | -113/+19 |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | |||||
* | | | | | | | | | Merge "libstagefright: set actual stride info for SW encoder input port" into... | Lajos Molnar | 2014-10-28 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| * | | | | | | | | libstagefright: set actual stride info for SW encoder input port | Lajos Molnar | 2014-10-25 | 1 | -0/+4 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | resolved conflicts for merge of f4147ee9 to lmp-mr1-dev-plus-aosp | Lajos Molnar | 2014-10-14 | 2 | -113/+19 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | / / / / / / | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | stagefright: fix surface input handling of software encoders | Lajos Molnar | 2014-10-13 | 2 | -107/+21 |
* | | | | | | | am 13006b9d: am 032ecb7f: Merge "Fix in SoftAVCEncoder plugin" | Narayan Kamath | 2014-09-04 | 1 | -3/+4 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge "Fix in SoftAVCEncoder plugin" | Narayan Kamath | 2014-09-04 | 1 | -3/+4 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix in SoftAVCEncoder plugin | Ashok Bhat | 2014-07-09 | 1 | -3/+4 |
* | | | | | | | | am e4478feb: Merge "Add adaptive playback support to VPX decoder." into lmp-dev | Ronghua Wu | 2014-09-02 | 1 | -4/+0 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Add adaptive playback support to VPX decoder. | Ronghua Wu | 2014-08-28 | 1 | -4/+0 |
* | | | | | | | | am 24a5a7c3: am b7a88e31: Merge "h264_enc: Use free() to release memory alloc... | Narayan Kamath | 2014-07-14 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / | |||||
| * | | | | | | h264_enc: Use free() to release memory allocated with malloc() | Ashok Bhat | 2014-06-25 | 1 | -2/+2 |
| |/ / / / / | |||||
| * | | | | | media: memset sizeof argument issues | Mark Salyzyn | 2014-04-11 | 1 | -1/+1 |
* | | | | | | Merge commit '52a23bd3' into manualmerge | Glenn Kasten | 2014-04-03 | 1 | -2/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | 64-bit: Correction to OMX_U32 and OMX_S32 | Glenn Kasten | 2014-04-02 | 1 | -2/+2 |
* | | | | | | Merge commit 'c250980f' into manualmerge | Glenn Kasten | 2014-03-19 | 1 | -2/+0 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | libstagefright is no longer 32 bit only. | Narayan Kamath | 2014-03-19 | 1 | -2/+0 |
* | | | | | | resolved conflicts for merge of 3c780188 to master | Glenn Kasten | 2014-03-14 | 1 | -0/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | mediaserver and associated services are 32-bit only | Glenn Kasten | 2014-03-12 | 1 | -0/+2 |
* | | | | | | Even more warnings (now errors) fixed to unbreak the sdk-x86 build(s). | Andreas Huber | 2014-02-12 | 1 | -1/+1 |
* | | | | | | am 1c178d3e: am 7eacea11: Merge "avcenc: Only do startcode escaping if the ne... | Lajos Molnar | 2014-02-11 | 1 | -6/+9 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | avcenc: Only do startcode escaping if the next byte requires it | Martin Storsjo | 2014-02-11 | 1 | -6/+9 |
* | | | | | | warnings be gone. | Andreas Huber | 2014-02-11 | 2 | -4/+15 |
|/ / / / / |