[Ffmpeg-cvslog] r6685 - trunk/libavcodec/h264.c

[michael]

Author: michael
Date: Fri Oct 13 18:19:15 2006
New Revision: 6685

Modified:
   trunk/libavcodec/h264.c

Log:
simplify escape decoding


Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c	(original)
+++ trunk/libavcodec/h264.c	Fri Oct 13 18:19:15 2006
@@ -6164,14 +6164,14 @@
             if( coeff_abs >= 15 ) {
                 int j = 0;
                 while( get_cabac_bypass( &h->cabac ) ) {
-                    coeff_abs += 1 << j;
                     j++;
                 }
 
+                coeff_abs=1;
                 while( j-- ) {
-                    if( get_cabac_bypass( &h->cabac ) )
-                        coeff_abs += 1 << j ;
+                    coeff_abs += coeff_abs + get_cabac_bypass( &h->cabac );
                 }
+                coeff_abs+= 14;
             }
 
             if( !qmul ) {