aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Bump the versions and add changelog entries for v2.0.2Martin Storsjo2021-04-283-5/+11
* Add files missing from EXTRA_DISTMartin Storsjo2021-04-281-0/+4
* Specify the macOS compatibility version to make it a drop-in replacement for ...Martin Storsjo2021-04-281-1/+3
* Don't use enums for values read directly from the bitstreamMartin Storsjo2021-04-231-5/+5
* Made this compatible with cmake version 3.5.1Staz M2021-04-071-1/+1
* Merge remote-tracking branch 'aosp/master'Martin Storsjo2021-03-044-59/+216
|\
| * Mark ab/7061308 as merged in stage.Xin Li2021-02-200-0/+0
| |\
| | * Mark ab/6881855 as merged am: b831187d3aXin Li2020-11-240-0/+0
| | |\
| | * \ [automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master ...Bill Yi2020-11-050-0/+0
| | |\ \
| | | * \ [automerger skipped] Merge "Merge rvc-release RP1A.201105.002 to aosp-master ...Bill Yi2020-11-050-0/+0
| | | |\ \
| | * | | | [automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO NO...Bill Yi2020-11-050-0/+0
| | |\| | |
| | | * | | [automerger skipped] Merge rvc-release RP1A.201105.002 to aosp-master - DO NO...Bill Yi2020-11-050-0/+0
| | | |\ \ \
| | * | | | | [automerger skipped] Merge rvc-release RP1A.201105.002 to stage-aosp-master -...Bill Yi2020-11-040-0/+0
| | |\| | | |
| | | * | | | [automerger skipped] Merge rvc-release RP1A.201105.002 to stage-aosp-master -...Bill Yi2020-11-040-0/+0
| | | |\ \ \ \
| | * | | | | | [automerger skipped] Skip ab/6749736 in stage. am: f473247482 -s ours am: aac...Xin Li2020-10-090-0/+0
| | |\| | | | |
| | | * | | | | [automerger skipped] Skip ab/6749736 in stage. am: f473247482 -s oursXin Li2020-10-090-0/+0
| | | |\ \ \ \ \
| * | | \ \ \ \ \ Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/aac" am: 9f1be9d06fBob Badour2021-02-172-0/+42
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/aac"Bob Badour2021-02-172-0/+42
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | [LSC] Add LOCAL_LICENSE_KINDS to external/aacBob Badour2021-02-142-0/+42
| * | | | | | | | | | Merge "Fix improper assignment in aac_enc_fuzzer" am: dde78303e8Treehugger Robot2021-02-171-1/+1
| |\| | | | | | | | |
| | * | | | | | | | | Merge "Fix improper assignment in aac_enc_fuzzer"Treehugger Robot2021-02-171-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Fix improper assignment in aac_enc_fuzzerAnuj Joshi2021-02-171-1/+1
| | |/ / / / / / / /
| * | | | | | | | | Merge "aac_enc_fuzzer: Improve code coverage" am: fbed528d62Treehugger Robot2021-02-143-52/+174
| |\| | | | | | | |
| | * | | | | | | | Merge "aac_enc_fuzzer: Improve code coverage"Treehugger Robot2021-02-143-52/+174
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | aac_enc_fuzzer: Improve code coverageAnuj Joshi2021-02-013-52/+174
| | |/ / / / / / / /
| * | | | | | | | | Merge "aac remove diag" am: f13c7a4054Cindy Zhou2021-01-201-7/+0
| |\| | | | | | | |
| | * | | | | | | | Merge "aac remove diag"Cindy Zhou2021-01-201-7/+0
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | aac remove diagCindy Zhou2021-01-131-7/+0
| * | | | | | | | | | Merge "Added aac_enc_fuzzer" am: 093573a634Kris Alder2021-01-133-9/+484
| |\| | | | | | | | |
| * | | | | | | | | | Merge "Enable cfi for aac" am: 5690f9c39fCindy Zhou2021-01-081-2/+8
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge "Adjust VBR mode depending on given peak bitrate and fix crash recovery...Treehugger Robot2021-01-084-36/+83
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Remove the separate nmakefile for MSVCMartin Storsjo2021-03-042-321/+0
* | | | | | | | | | | Fixed a typo in the documentationChristian Budde2021-03-011-1/+1
* | | | | | | | | | | Avoid failing asserts on broken bitstreamsMartin Storsjo2021-02-041-0/+2
* | | | | | | | | | | Add CMake projectevpobr2021-01-205-0/+627
* | | | | | | | | | | Merge remote-tracking branch 'aosp/master'Martin Storsjo2021-01-148-47/+575
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge "Added aac_enc_fuzzer"Kris Alder2021-01-133-9/+484
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Added aac_enc_fuzzerAnuj Joshi2020-12-283-9/+484
| | |/ / / / / / / /
| * | | | | | | | | Merge "Enable cfi for aac"Cindy Zhou2021-01-081-2/+8
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| | * | | | | | | | Enable cfi for aacCindy Zhou2020-12-171-2/+8
| | |/ / / / / / /
| * | | | | | | | Merge "Adjust VBR mode depending on given peak bitrate and fix crash recovery...Treehugger Robot2021-01-084-36/+83
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Adjust VBR mode depending on given peak bitrate and fix crash recovery usage.Fraunhofer IIS FDK2021-01-084-36/+83
| |/ / / / / / /
| * | | | | | / Mark ab/6881855 as mergedXin Li2020-11-230-0/+0
| |\| | | | | | | | |_|_|_|_|/ | |/| | | | |
| | * | | | | [automerger skipped] Merge "Merge Android R" am: 89b6626d5d -s ours am: 26a03...Xin Li2020-09-110-0/+0
| | |\| | | |
| | | * | | | [automerger skipped] Merge "Merge Android R" am: 89b6626d5d -s ours am: 26a03...Xin Li2020-09-110-0/+0
| | | |\ \ \ \
| | | | * \ \ \ [automerger skipped] Merge "Merge Android R" am: 89b6626d5d -s ours am: 26a03...Xin Li2020-09-110-0/+0
| | | | |\ \ \ \
| | * | | \ \ \ \ [automerger skipped] [DO NOT MERGE] Fix heap buffer overflow in sbrDecoder_As...Fraunhofer IIS FDK2020-09-100-0/+0
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ [automerger skipped] [DO NOT MERGE] Fix heap buffer overflow in sbrDecoder_As...Fraunhofer IIS FDK2020-09-090-0/+0
| | | |\ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ [automerger skipped] [DO NOT MERGE] Fix heap buffer overflow in sbrDecoder_As...Fraunhofer IIS FDK2020-09-090-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | |
| | | * | | | | | | | [automerger skipped] [DO NOT MERGE] Fix heap buffer overflow in sbrDecoder_As...Fraunhofer IIS FDK2020-09-090-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | | |_|/ / / / / | | | | |/| | | | | |