Browse Source

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.
tags/n3.1
Rostislav Pehlivanov 10 years ago
parent
commit
02172d93f6
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      libavcodec/aacenc_quantization.h

+ 1
- 1
libavcodec/aacenc_quantization.h View File

@@ -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);


Loading…
Cancel
Save