diff options
| author | Jason Garrett-Glaser <darkshikari@gmail.com> | 2011-01-15 18:13:40 +0000 |
|---|---|---|
| committer | Jason Garrett-Glaser <darkshikari@gmail.com> | 2011-01-15 18:13:40 +0000 |
| commit | fb2734c8a60f275f17a95ae413dd38b5c616bc1a (patch) | |
| tree | 9ee5ccbb72a8b2f293796b83a2b0fb61789980bc /libavcodec/h264_cabac.c | |
| parent | f14bdd8e756e7a2bc17f7202d880a6dc283df924 (diff) | |
Fix r26375 on non-x86.
Originally committed as revision 26376 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264_cabac.c')
| -rw-r--r-- | libavcodec/h264_cabac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index 84dde0b8be..f8083808e7 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -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 ) { /* 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; return; } @@ -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 ) { /* 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; return; } |