Commit d2b54ec8 authored by Alexander Strange's avatar Alexander Strange

Use h->mb_xy directly in decode_cabac_residual().

Originally committed as revision 13126 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 64514ee8
...@@ -5494,11 +5494,11 @@ static void decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int ...@@ -5494,11 +5494,11 @@ static void decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int
assert(coeff_count > 0); assert(coeff_count > 0);
if( cat == 0 ) if( cat == 0 )
h->cbp_table[mb_xy] |= 0x100; h->cbp_table[h->mb_xy] |= 0x100;
else if( cat == 1 || cat == 2 ) else if( cat == 1 || cat == 2 )
h->non_zero_count_cache[scan8[n]] = coeff_count; h->non_zero_count_cache[scan8[n]] = coeff_count;
else if( cat == 3 ) else if( cat == 3 )
h->cbp_table[mb_xy] |= 0x40 << n; h->cbp_table[h->mb_xy] |= 0x40 << n;
else if( cat == 4 ) else if( cat == 4 )
h->non_zero_count_cache[scan8[16+n]] = coeff_count; h->non_zero_count_cache[scan8[16+n]] = coeff_count;
else { else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment