mirror of
https://github.com/mstorsjo/fdk-aac.git
synced 2025-06-05 22:39:13 +02:00
Merge changes from topic "am-33ca3d69-2b65-4c99-8266-49b4f5c3c1c9" into oc-dev
* changes: [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am:4a54666f3e
am:adc8026945
am:6dd431c768
am:4523eae489
skipped:b2d0afac05
am:14728790d3
am:1296b91454
am:e94aa9aa3c
am:5e8b2b0a38
skipped:490995c3c4
[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am:4a54666f3e
am:adc8026945
am:6dd431c768
am:4523eae489
skipped:b2d0afac05
am:14728790d3
am:1296b91454
am:e94aa9aa3c
am:5e8b2b0a38
[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am:4a54666f3e
am:adc8026945
am:6dd431c768
am:4523eae489
skipped:b2d0afac05
am:14728790d3
am:1296b91454
am:e94aa9aa3c
[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am:4a54666f3e
am:adc8026945
am:6dd431c768
am:4523eae489
skipped:b2d0afac05
am:14728790d3
am:1296b91454
[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am:4a54666f3e
am:adc8026945
am:6dd431c768
am:4523eae489
skipped:b2d0afac05
am:14728790d3
[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am:4a54666f3e
am:adc8026945
am:6dd431c768
am:4523eae489
skipped:b2d0afac05
[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am:4a54666f3e
am:adc8026945
am:6dd431c768
am:4523eae489
[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am:4a54666f3e
am:adc8026945
am:6dd431c768
[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am:4a54666f3e
am:adc8026945
[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am:4a54666f3e
DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info
This commit is contained in:
committed by
Android (Google) Code Review
commit
378e6c244a