aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reorder source file lists in Makefile.am into alphabetical orderMartin Storsjo2018-09-021-58/+58
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Makefile.am after the upstream source updateMartin Storsjo2018-09-021-15/+89
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'aosp/master'Martin Storsjo2018-09-02453-85220/+165810
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Merge Android Pie into master"Xin Li2018-08-07450-84893/+165806
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge Android Pie into masterXin Li2018-08-06450-84893/+165806
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pi-dev-plus-aosp-without-vendor into stage-aosp-masterXin Li2018-06-08450-84893/+165806
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Fix unsigned integer overflow in aacDecoder_UpdateBitStreamCounters()Fraunhofer IIS FDK2018-05-252-10/+12
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | / | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | Fix unsigned integer overflow in aacDecoder_UpdateBitStreamCounters()Fraunhofer IIS FDK2018-05-252-10/+12
| | | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | FDKv2 ubsan patchesFraunhofer IIS FDK2018-05-2416-126/+150
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | FDKv2 ubsan patchesFraunhofer IIS FDK2018-05-2316-126/+150
| | | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | FDK patches: fix overflows in decoder out-of-band configFraunhofer IIS FDK2018-05-098-26/+28
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | FDK patches: fix overflows in decoder out-of-band configFraunhofer IIS FDK2018-05-098-26/+28
| | | | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | FDKv2 additional fixesFraunhofer IIS FDK2018-05-0410-31/+55
| | | |\| | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | FDKv2 additional fixesFraunhofer IIS FDK2018-05-0410-31/+55
| | | | | |_|_|_|_|_|_|_|/ / / / / / / / / | | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Upgrade to FDKv2Fraunhofer IIS FDK2018-04-30450-84882/+165724
| | | |\| | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Upgrade to FDKv2Fraunhofer IIS FDK2018-04-19450-84882/+165724
| | | |/ / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | [automerger skipped] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid h...Android Build Merger (Role)2018-02-020-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid h...Android Build Merger (Role)2018-02-020-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|/ / / / / / / / | | | | | |/| | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | [automerger skipped] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid h...Android Build Merger (Role)2018-02-020-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|_|_|_|_|/ / / / / / / | | | | | | |/| | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | [automerger skipped] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid h...Android Build Merger (Role)2018-02-010-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |_|_|_|_|_|_|/ / / / / / | | | | | | | |/| | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | [automerger skipped] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid h...Android Build Merger (Role)2018-02-010-0/+0
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | |_|_|_|_|_|_|/ / / / / | | | | | | | | |/| | | | | | | | | | |
| | | | | | | | * | | | | | | | | | | | DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height infoJean-Michel Trivi2018-02-010-0/+0
| | | * | | | | | | | | | | | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height in...Android Build Merger (Role)2018-02-020-0/+0
| | | |\| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height in...Android Build Merger (Role)2018-02-020-0/+0
| | | | |\| | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height in...Android Build Merger (Role)2018-02-020-0/+0
| | | | | |\| | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height in...Android Build Merger (Role)2018-02-010-0/+0
| | | | | | |\| | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height in...Android Build Merger (Role)2018-02-010-0/+0
| | | | | | | |\| | | | | | | | | | | |
| | | | | | | | * | | | | | | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height in...Android Build Merger (Role)2018-02-010-0/+0
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | |_|_|_|_|_|_|/ / / / | | | | | | | | | |/| | | | | | | | | |
| | | | | | | | | * | | | | | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height in...Android Build Merger (Role)2018-02-010-0/+0
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | |_|_|_|_|_|_|/ / / | | | | | | | | | | |/| | | | | | | | |
| | | | | | | | | | * | | | | | | | | | DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height infoJean-Michel Trivi2018-02-010-0/+0
| | | * | | | | | | | | | | | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height in...Android Build Merger (Role)2018-02-020-0/+0
| | | |\| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height in...Android Build Merger (Role)2018-02-020-0/+0
| | | | |\| | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height in...Android Build Merger (Role)2018-02-020-0/+0
| | | | | |\| | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height in...Android Build Merger (Role)2018-02-010-0/+0
| | | | | | |\| | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height in...Android Build Merger (Role)2018-02-010-0/+0
| | | | | | | |\| | | | | | | | | | | |
| | | | | | | | * | | | | | | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height in...Android Build Merger (Role)2018-02-011-4/+19
| | | | | | | | |\| | | | | | | | | | |
| | | | | | | | | * | | | | | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height in...Android Build Merger (Role)2018-02-011-4/+19
| | | | | | | | | |\| | | | | | | | | |
| | | | | | | | | | * | | | | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height in...Android Build Merger (Role)2018-02-011-4/+19
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | |_|_|_|_|_|_|/ / | | | | | | | | | | | |/| | | | | | | |
| | | | | | | | | | | * | | | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height in...Android Build Merger (Role)2018-02-011-4/+19
| | | | | | | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | |_|_|_|_|_|_|/ | | | | | | | | | | | | |/| | | | | | |
| | | | | | | | | | | | * | | | | | | | DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height infoJean-Michel Trivi2018-02-011-4/+19
| | | * | | | | | | | | | | | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height in...Android Build Merger (Role)2018-02-020-0/+0
| | | |\| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height in...Android Build Merger (Role)2018-02-020-0/+0
| | | | |\| | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height in...Android Build Merger (Role)2018-02-020-0/+0
| | | | | |\| | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height in...Android Build Merger (Role)2018-02-010-0/+0
| | | | | | |\| | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height in...Android Build Merger (Role)2018-02-010-0/+0
| | | | | | | |\| | | | | | | | | | | |
| | | | | | | | * | | | | | | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height in...Android Build Merger (Role)2018-02-010-0/+0
| | | | | | | | |\| | | | | | | | | | |
| | | | | | | | | * | | | | | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height in...Android Build Merger (Role)2018-02-010-0/+0
| | | | | | | | | |\| | | | | | | | | |
| | | | | | | | | | * | | | | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height in...Android Build Merger (Role)2018-02-010-0/+0
| | | | | | | | | | |\| | | | | | | | |
| | | | | | | | | | | * | | | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height in...Android Build Merger (Role)2018-02-010-0/+0
| | | | | | | | | | | |\| | | | | | | |
| | | | | | | | | | | | * | | | | | | | [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height in...Android Build Merger (Role)2018-02-010-0/+0
| | | | | | | | | | | | |\ \ \ \ \ \ \ \