diff options
| author | Martin Storsjo <martin@martin.st> | 2017-12-20 10:21:34 +0200 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2017-12-20 10:21:34 +0200 |
| commit | 1b0cec288c5a0867ee0c008cd5a846facb72a524 (patch) | |
| tree | fb7bf180d2ea01ec9895ff49b7e519dc1230c45d /libAACenc | |
| parent | 56c717e223a161b11f523de97dae51c5cccd6b52 (diff) | |
| download | fdk-aac-1b0cec288c5a0867ee0c008cd5a846facb72a524.tar.gz fdk-aac-1b0cec288c5a0867ee0c008cd5a846facb72a524.tar.bz2 fdk-aac-1b0cec288c5a0867ee0c008cd5a846facb72a524.zip | |
Fix an assertion failure when encoding a particular input at specific bitrates
Diffstat (limited to 'libAACenc')
| -rw-r--r-- | libAACenc/src/sf_estim.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libAACenc/src/sf_estim.cpp b/libAACenc/src/sf_estim.cpp index 1cb243b..75b8d42 100644 --- a/libAACenc/src/sf_estim.cpp +++ b/libAACenc/src/sf_estim.cpp @@ -533,6 +533,7 @@ static void FDKaacEnc_assimilateSingleScf(PSY_OUT_CHANNEL *psyOutChan, (scfAct > scfMin) && (scfAct <= scfMin+MAX_SCF_DELTA) && (scfAct >= scfMax-MAX_SCF_DELTA) && + (scfAct <= fixMin(scfMin,fixMin(*scfLast, *scfNext))+MAX_SCF_DELTA) && (*scfLast != prevScfLast[sfbAct] || *scfNext != prevScfNext[sfbAct] || deltaPe < deltaPeLast[sfbAct])) { |