diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2018-02-01 17:27:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-02-01 17:27:43 +0000 |
| commit | 378e6c244a5209ae141f1b772c575d0605c720a7 (patch) | |
| tree | 000a7b196f8ce79c38165ca17ab5d7d9ea695bc9 /libSBRenc/src/sbrenc_freq_sca.h | |
| parent | 8415da3381daf90b4e488df8e056c2d7261d2d14 (diff) | |
| parent | 6cad71f03e00e910b48fca062afa18ba9a5bb322 (diff) | |
| download | fdk-aac-378e6c244a5209ae141f1b772c575d0605c720a7.tar.gz fdk-aac-378e6c244a5209ae141f1b772c575d0605c720a7.tar.bz2 fdk-aac-378e6c244a5209ae141f1b772c575d0605c720a7.zip | |
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
Diffstat (limited to 'libSBRenc/src/sbrenc_freq_sca.h')
0 files changed, 0 insertions, 0 deletions