diff options
author | Justin Ruggles <justin.ruggles@gmail.com> | 2007-03-22 05:38:00 +0000 |
---|---|---|
committer | Justin Ruggles <justin.ruggles@gmail.com> | 2007-03-22 05:38:00 +0000 |
commit | 319708da026702c3fcfbfed0dc7c48263ac10d23 (patch) | |
tree | a56f8a7f5a777960ee3c63f873ffde18bc87c310 | |
parent | bbd16dea671373a6eb216b12ebaf8d9b3e6a7c9c (diff) | |
download | ffmpeg-319708da026702c3fcfbfed0dc7c48263ac10d23.tar.gz |
simplify
Originally committed as revision 8478 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | libavcodec/ac3enc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c index 1fbe751d49..71d78460bf 100644 --- a/libavcodec/ac3enc.c +++ b/libavcodec/ac3enc.c @@ -467,6 +467,9 @@ static int bit_alloc(AC3EncodeContext *s, int frame_bits, int csnroffst, int fsnroffst) { int i, ch; + int snroffset; + + snroffset = (((csnroffst - 15) << 4) + fsnroffst) << 2; /* compute size */ for(i=0;i<NB_BLOCKS;i++) { @@ -476,8 +479,7 @@ static int bit_alloc(AC3EncodeContext *s, for(ch=0;ch<s->nb_all_channels;ch++) { ff_ac3_bit_alloc_calc_bap(mask[i][ch], psd[i][ch], 0, s->nb_coefs[ch], - (((csnroffst-15) << 4) + - fsnroffst) << 2, + snroffset, s->bit_alloc.floor, bap[i][ch]); frame_bits += compute_mantissa_size(s, bap[i][ch], s->nb_coefs[ch]); |