diff options
| author | Rostislav Pehlivanov <atomnuker@gmail.com> | 2016-03-30 02:31:22 +0100 |
|---|---|---|
| committer | Rostislav Pehlivanov <atomnuker@gmail.com> | 2016-03-30 02:31:22 +0100 |
| commit | 02172d93f6b25b61228d1d8a6204ccb3e80cfcd3 (patch) | |
| tree | e90c7790d284b94f6555ee80a1771103ab7c560a /libavcodec/aacenc_quantization.h | |
| parent | 7cda7683a547bbac0a2849815659b8cce6b3b57c (diff) | |
| download | ffmpeg-02172d93f6b25b61228d1d8a6204ccb3e80cfcd3.tar.gz | |
Revert "aacenc: use av_clip() instead of av_clip() during quantization"
This reverts commit c0918613a0ecaac6819409c64107583eebc0ccc2, since it
triggered a new assertion with gcc.
This bug definitely needs a true proper fix.
Diffstat (limited to 'libavcodec/aacenc_quantization.h')
| -rw-r--r-- | libavcodec/aacenc_quantization.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/aacenc_quantization.h b/libavcodec/aacenc_quantization.h index 106e632d05..425040748c 100644 --- a/libavcodec/aacenc_quantization.h +++ b/libavcodec/aacenc_quantization.h @@ -141,7 +141,7 @@ static av_always_inline float quantize_and_encode_band_cost_template( if (BT_ESC) { for (j = 0; j < 2; j++) { if (ff_aac_codebook_vectors[cb-1][curidx*2+j] == 64.0f) { - int coef = av_clip(quant(fabsf(in[i+j]), Q, ROUNDING), 0, (1 << 13) - 1); + int coef = av_clip_uintp2(quant(fabsf(in[i+j]), Q, ROUNDING), 13); int len = av_log2(coef); put_bits(pb, len - 4 + 1, (1 << (len - 4 + 1)) - 2); |