[Ffmpeg-cvslog] r8478 - trunk/libavcodec/ac3enc.c

jbr subversion
Thu Mar 22 06:38:00 CET 2007


Author: jbr
Date: Thu Mar 22 06:38:00 2007
New Revision: 8478

Modified:
   trunk/libavcodec/ac3enc.c

Log:
simplify

Modified: trunk/libavcodec/ac3enc.c
==============================================================================
--- trunk/libavcodec/ac3enc.c	(original)
+++ trunk/libavcodec/ac3enc.c	Thu Mar 22 06:38:00 2007
@@ -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]);




More information about the ffmpeg-cvslog mailing list