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>
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user