[SCM] libav/experimental: simplify

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 319708da026702c3fcfbfed0dc7c48263ac10d23
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date:   Thu Mar 22 05:38:00 2007 +0000

    simplify
    
    Originally committed as revision 8478 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c
index 1fbe751..71d7846 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]);

-- 
Libav/FFmpeg packaging