Mercurial > libavcodec.hg
comparison aacsbr.c @ 11901:829dadee50c8 libavcodec
aacsbr: Make dk signed. There is no point in it being unsigned.
| author | alexc |
|---|---|
| date | Sun, 20 Jun 2010 23:03:32 +0000 |
| parents | a0c269879276 |
| children | 8c657be75c11 |
comparison
equal
deleted
inserted
replaced
| 11900:9ee7f1655fb5 | 11901:829dadee50c8 |
|---|---|
| 377 "Invalid bitstream, too many QMF subbands: %d\n", sbr->k[2] - sbr->k[0]); | 377 "Invalid bitstream, too many QMF subbands: %d\n", sbr->k[2] - sbr->k[0]); |
| 378 return -1; | 378 return -1; |
| 379 } | 379 } |
| 380 | 380 |
| 381 if (!spectrum->bs_freq_scale) { | 381 if (!spectrum->bs_freq_scale) { |
| 382 unsigned int dk; | 382 int dk, k2diff; |
| 383 int k2diff; | |
| 384 | 383 |
| 385 dk = spectrum->bs_alter_scale + 1; | 384 dk = spectrum->bs_alter_scale + 1; |
| 386 sbr->n_master = ((sbr->k[2] - sbr->k[0] + (dk&2)) >> dk) << 1; | 385 sbr->n_master = ((sbr->k[2] - sbr->k[0] + (dk&2)) >> dk) << 1; |
| 387 if (check_n_master(ac->avctx, sbr->n_master, sbr->spectrum_params.bs_xover_band)) | 386 if (check_n_master(ac->avctx, sbr->n_master, sbr->spectrum_params.bs_xover_band)) |
| 388 return -1; | 387 return -1; |