[FFmpeg-cvslog] r26376 - trunk/libavcodec/h264_cabac.c

darkshikari subversion
Sat Jan 15 19:13:40 CET 2011


Author: darkshikari
Date: Sat Jan 15 19:13:40 2011
New Revision: 26376

Log:
Fix r26375 on non-x86.

Modified:
   trunk/libavcodec/h264_cabac.c

Modified: trunk/libavcodec/h264_cabac.c
==============================================================================
--- trunk/libavcodec/h264_cabac.c	Sat Jan 15 18:52:48 2011	(r26375)
+++ trunk/libavcodec/h264_cabac.c	Sat Jan 15 19:13:40 2011	(r26376)
@@ -1171,7 +1171,7 @@ static void decode_cabac_residual_nondc_
 
 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_caba
 
 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;
     }



More information about the ffmpeg-cvslog mailing list