Use h->mb_xy directly in decode_cabac_residual().
authorAlexander Strange <astrange@ithinksw.com>
Sun, 11 May 2008 19:18:39 +0000 (19:18 +0000)
committerAlexander Strange <astrange@ithinksw.com>
Sun, 11 May 2008 19:18:39 +0000 (19:18 +0000)
Originally committed as revision 13126 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/h264.c

index ebfa62e..f41e7fa 100644 (file)
@@ -5494,11 +5494,11 @@ static void decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int
     assert(coeff_count > 0);
 
     if( cat == 0 )
-        h->cbp_table[mb_xy] |= 0x100;
+        h->cbp_table[h->mb_xy] |= 0x100;
     else if( cat == 1 || cat == 2 )
         h->non_zero_count_cache[scan8[n]] = coeff_count;
     else if( cat == 3 )
-        h->cbp_table[mb_xy] |= 0x40 << n;
+        h->cbp_table[h->mb_xy] |= 0x40 << n;
     else if( cat == 4 )
         h->non_zero_count_cache[scan8[16+n]] = coeff_count;
     else {