[FFmpeg-soc] [soc]: r3858 - dirac/libavcodec/dirac.h

[conrad]

Author: conrad
Date: Thu Dec  4 22:10:23 2008
New Revision: 3858

Log:
Simplify coeff_quant_factor a little


Modified:
   dirac/libavcodec/dirac.h

Modified: dirac/libavcodec/dirac.h
==============================================================================
--- dirac/libavcodec/dirac.h	(original)
+++ dirac/libavcodec/dirac.h	Thu Dec  4 22:10:23 2008
@@ -271,8 +271,7 @@ static int inline subband_height(DiracCo
 // which schoedinger and dirac-research also assume
 static unsigned int inline coeff_quant_factor(unsigned int quant)
 {
-    uint64_t base;
-    base = 1 << (quant / 4);
+    uint64_t base = 1 << (quant / 4);
     switch(quant & 3) {
     case 0:
         return base << 2;
@@ -283,7 +282,8 @@ static unsigned int inline coeff_quant_f
     case 3:
         return (440253 * base + 32722) / 65444;
     }
-    return 0; /* XXX: should never be reached */
+    assert(0);
+    return 0;
 }
 
 static unsigned int inline coeff_quant_offset(DiracContext *s, unsigned int quant)