summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-10.0.0_r33' into lineage-17.1-android-10.0.0_r33lineage-17.1Luca Stefani2020-04-091-4/+10
|\
| * Merge cherrypicks of [10298392, 10300120, 10300112, 10298398, 10300814, 10300...android-build-team Robot2020-02-111-4/+10
| |\
| | * vdec: Set correct output buffer size: dynamic meta modePriyanka Gujjula2020-02-111-4/+10
| |/
* | Merge tag 'android-10.0.0_r31' into lineage-17.1-android-10.0.0_r31Luca Stefani2020-03-077-21/+46
|\|
| * Snap for 5974819 from 1da75db0dad8512b058c6e2a6781bca3e1556de3 to qt-qpr2-rel...android-build-team Robot2019-10-307-21/+46
| |\
| | * mm-video-v4l2: venc: revert add support for handling EOS bufferwenchangliu2019-10-172-7/+3
| | * mm-video-v4l2: venc: Check private handle->flags changed in empty_this_buffer...Jerry Huang2019-10-146-14/+36
| | * mm-video-v4l2: venc: Set 601-Limited colorspace for color-converted buffersPraveen Chavan2019-10-141-0/+7
| |/
* | media: drop byte typedefstaging/lineage-17.0_merge-android-10.0.0_r9Alessandro Astone2019-12-111-2/+1
* | media: vdec: Include nativebase headersRashed Abdel-Tawab2019-12-111-0/+2
* | mm-video: venc: Correct a typo in variable nameDeepak Verma2019-12-116-19/+19
* | Revert "msm8974: remove from top level makefile"Chirayu Desai2019-12-111-3/+3
* | media: Use generated kernel headersrazorloves2019-12-115-0/+24
|/
* [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"...Xin Li2019-03-110-0/+0
|\
| * [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"...Xin Li2019-03-110-0/+0
| |\
| | * [automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"Xin Li2019-03-110-0/+0
| | |\
| | | * Merge "DO NOT MERGE - Merge PPRL.190305.001 into master"Treehugger Robot2019-03-110-0/+0
| | | |\
* | | | | [automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: e85...Xin Li2019-03-110-0/+0
|\| | | |
| * | | | [automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: e85...Xin Li2019-03-110-0/+0
| |\| | |
| | * | | [automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into masterXin Li2019-03-110-0/+0
| | |\ \ \ | | | | |/ | | | |/|
| | | * | DO NOT MERGE - Merge PPRL.190305.001 into masterXin Li2019-03-110-0/+0
| | | |\ \ | | | | |/ | | | |/|
* | | | | Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
|\| | | |
| * | | | Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| |\| | |
| | * | | DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li2019-02-200-0/+0
| | |\ \ \
* | | | | | [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.00...Xin Li2019-02-110-0/+0
|\| | | | |
| * | | | | [automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.00...Xin Li2019-02-110-0/+0
| |\| | | | | | |/ / / | |/| | |
| | * | | DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-ma...Xin Li2019-02-110-0/+0
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Snap for 5180536 from 8ff87e5b12f4c5dba8d0ece8e8c63535d704ed1a to pi-platform...android-build-team Robot2019-02-090-0/+0
| | | |\ \
| | | | * \ Snap for 5044688 from a9ce4757f75ad260ba6c022cd875ba21fb3f8089 to pi-qpr2-rel...android-build-team Robot2018-10-020-0/+0
| | | | |\ \
* | | | | | | [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.1...Xin Li2018-12-130-0/+0
|\| | | | | |
| * | | | | | [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.1...Xin Li2018-12-130-0/+0
| |\| | | | |
| | * | | | | [automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.1...Xin Li2018-12-130-0/+0
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master"Treehugger Robot2018-12-131-12/+12
| | | |\ \ \ \
* | | | | | | | [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.0...Xin Li2018-12-130-0/+0
|\| | | | | | |
| * | | | | | | [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.0...Xin Li2018-12-130-0/+0
| |\| | | | | |
| | * | | | | | [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.0...Xin Li2018-12-130-0/+0
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into masterXin Li2018-12-111-12/+12
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| / / / | | | | |/ / /
* | | | | | | [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.0...Xin Li2018-12-110-0/+0
|\| | | | | |
| * | | | | | [automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.0...Xin Li2018-12-110-0/+0
| |\| | | | |
| | * | | | | DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-m...Xin Li2018-12-111-12/+12
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-releaseBill Yi2018-11-281-12/+12
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | | * | | Merge cherrypicks of [4986743, 4986744, 4987539, 4987168, 4986376, 4986377, 4...android-build-team Robot2018-09-101-12/+12
| | | | |\ \ \
| | | | | * | | mm-video-v4l2: vdec: Correct order of reading color primariesSanthosh Behara2018-09-101-12/+12
| | | | |/ / /
* | | | | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE...Bill Yi2018-10-250-0/+0
|\| | | | | |
| * | | | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE...Bill Yi2018-10-240-0/+0
| |\| | | | |
| | * | | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | | |\| | |
* | | | | | | [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ...Bill Yi2018-10-250-0/+0
|\| | | | | |
| * | | | | | [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ...Bill Yi2018-10-240-0/+0
| |\| | | | |
| | * | | | | Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |