diff cabac.h @ 4039:866a83726985 libavcodec

Kill a warning with MSVC Patch by Jindrich Makovicka makovick A gmail P com Original thread: Date: 08:21 AM Subject Re: [Ffmpeg-devel] Weird line in cabac.h
author gpoirier
date Wed, 18 Oct 2006 09:37:25 +0000
parents 53be304c7f54
children 9eaea06c5ba6
line wrap: on
line diff
--- a/cabac.h	Tue Oct 17 23:59:21 2006 +0000
+++ b/cabac.h	Wed Oct 18 09:37:25 2006 +0000
@@ -33,6 +33,7 @@
 #define CABAC_MASK ((1<<CABAC_BITS)-1)
 #define BRANCHLESS_CABAC_DECODER 1
 #define CMOV_IS_FAST 1
+//#define ARCH_X86_DISABLED 1
 
 typedef struct CABACContext{
     int low;
@@ -48,7 +49,7 @@
 }CABACContext;
 
 extern uint8_t ff_h264_mlps_state[4*64];
-extern uint8_t ff_h264_lps_range[4][2*64];  ///< rangeTabLPS
+extern uint8_t ff_h264_lps_range[4*2*64];  ///< rangeTabLPS
 extern uint8_t ff_h264_mps_state[2*64];     ///< transIdxMPS
 extern uint8_t ff_h264_lps_state[2*64];     ///< transIdxLPS
 extern const uint8_t ff_h264_norm_shift[512];
@@ -524,7 +525,7 @@
 #endif /* BRANCHLESS_CABAC_DECODER */
 #else /* defined(ARCH_X86) && !(defined(PIC) && defined(__GNUC__)) */
     int s = *state;
-    int RangeLPS= ff_h264_lps_range[0][2*(c->range&0xC0) + s];
+    int RangeLPS= ff_h264_lps_range[2*(c->range&0xC0) + s];
     int bit, lps_mask attribute_unused;
 
     c->range -= RangeLPS;