Commit fb2734c8 authored by Jason Garrett-Glaser's avatar Jason Garrett-Glaser

Fix r26375 on non-x86.

Originally committed as revision 26376 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent f14bdd8e
...@@ -1171,7 +1171,7 @@ static void decode_cabac_residual_nondc_internal( H264Context *h, DCTELEM *block ...@@ -1171,7 +1171,7 @@ static void decode_cabac_residual_nondc_internal( H264Context *h, DCTELEM *block
static av_always_inline void decode_cabac_residual_dc( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, int max_coeff ) { static av_always_inline void decode_cabac_residual_dc( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, int max_coeff ) {
/* read coded block flag */ /* read coded block flag */
if( get_cabac( CC, &h->cabac_state[85 + get_cabac_cbf_ctx( h, cat, n, 1 ) ] ) == 0 ) { if( get_cabac( &h->cabac, &h->cabac_state[85 + get_cabac_cbf_ctx( h, cat, n, 1 ) ] ) == 0 ) {
h->non_zero_count_cache[scan8[n]] = 0; h->non_zero_count_cache[scan8[n]] = 0;
return; return;
} }
...@@ -1180,7 +1180,7 @@ static av_always_inline void decode_cabac_residual_dc( H264Context *h, DCTELEM * ...@@ -1180,7 +1180,7 @@ static av_always_inline void decode_cabac_residual_dc( H264Context *h, DCTELEM *
static av_always_inline void decode_cabac_residual_nondc( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff ) { static av_always_inline void decode_cabac_residual_nondc( H264Context *h, DCTELEM *block, int cat, int n, const uint8_t *scantable, const uint32_t *qmul, int max_coeff ) {
/* read coded block flag */ /* read coded block flag */
if( cat != 5 && get_cabac( CC, &h->cabac_state[85 + get_cabac_cbf_ctx( h, cat, n, 0 ) ] ) == 0 ) { if( cat != 5 && get_cabac( &h->cabac, &h->cabac_state[85 + get_cabac_cbf_ctx( h, cat, n, 0 ) ] ) == 0 ) {
h->non_zero_count_cache[scan8[n]] = 0; h->non_zero_count_cache[scan8[n]] = 0;
return; return;
} }
......
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