Mercurial > libavcodec.hg
changeset 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 | 16697bdf4ac2 |
| children | 9eaea06c5ba6 |
| files | cabac.c cabac.h |
| diffstat | 2 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/cabac.c Tue Oct 17 23:59:21 2006 +0000 +++ b/cabac.c Wed Oct 18 09:37:25 2006 +0000 @@ -51,7 +51,7 @@ }; uint8_t ff_h264_mlps_state[4*64]; -uint8_t ff_h264_lps_range[4][2*64]; +uint8_t ff_h264_lps_range[4*2*64]; uint8_t ff_h264_lps_state[2*64]; uint8_t ff_h264_mps_state[2*64]; @@ -152,8 +152,8 @@ for(i=0; i<64; i++){ for(j=0; j<4; j++){ //FIXME check if this is worth the 1 shift we save - ff_h264_lps_range[j][2*i+0]= - ff_h264_lps_range[j][2*i+1]= lps_range[i][j]; + ff_h264_lps_range[j*2*64+2*i+0]= + ff_h264_lps_range[j*2*64+2*i+1]= lps_range[i][j]; } ff_h264_mlps_state[128+2*i+0]=
--- 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;