diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-01 02:55:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-01 02:58:15 +0200 |
| commit | 7ac167493e5404fd2d3f307d02127f23fca970f0 (patch) | |
| tree | bea8a71cd59b1ea9a63692f7df1bdedb8446a9c1 /libavcodec/ac3enc.c | |
| parent | 859676dd426e7051b41b174886e6e64271e93cdc (diff) | |
| parent | e006d71fa849542eb27146efac629288703b3d75 (diff) | |
| download | ffmpeg-7ac167493e5404fd2d3f307d02127f23fca970f0.tar.gz | |
Merge remote-tracking branch 'newdev/master'
* newdev/master:
mpegts: propagate avio EOF in read_packet()
configure: Initial support for --target-os=symbian
Fixed-point FFT and MDCT
Include dependencies for test programs
ac3enc: simplify sym_quant()
flvdec: read index stored in the 'keyframes' tag.
mov: Add support for zero-sized stsc runs.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ac3enc.c')
| -rw-r--r-- | libavcodec/ac3enc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c index 2b9315dbe3..bc6b9c8766 100644 --- a/libavcodec/ac3enc.c +++ b/libavcodec/ac3enc.c @@ -1192,7 +1192,7 @@ static int compute_bit_allocation(AC3EncodeContext *s) */ static inline int sym_quant(int c, int e, int levels) { - int v = ((((levels * c) >> (24 - e)) + 1) >> 1) + (levels >> 1); + int v = (((levels * c) >> (24 - e)) + levels) >> 1; av_assert2(v >= 0 && v < levels); return v; } |