diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c
index 2e802f5fb5..86ee926b5c 100644
--- a/libavcodec/h264_cavlc.c
+++ b/libavcodec/h264_cavlc.c
@@ -911,14 +911,14 @@ decode_intra_mb:
             else                     cbp= golomb_to_inter_cbp_gray[cbp];
         }
     }
-    h->cbp = cbp;
 
     if(dct8x8_allowed && (cbp&15) && !IS_INTRA(mb_type)){
         if(get_bits1(&s->gb)){
             mb_type |= MB_TYPE_8x8DCT;
-            h->cbp_table[mb_xy]= cbp;
         }
     }
+    h->cbp=
+    h->cbp_table[mb_xy]= cbp;
     s->current_picture.mb_type[mb_xy]= mb_type;
 
     if(cbp || IS_INTRA16x16(mb_type)){