Mercurial > libavcodec.hg
comparison cabac.c @ 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 | d550343b5dac |
children | 2b72f9bc4f06 |
comparison
equal
deleted
inserted
replaced
4038:16697bdf4ac2 | 4039:866a83726985 |
---|---|
49 { 8, 9, 11, 13}, { 7, 9, 11, 12}, { 7, 9, 10, 12}, { 7, 8, 10, 11}, | 49 { 8, 9, 11, 13}, { 7, 9, 11, 12}, { 7, 9, 10, 12}, { 7, 8, 10, 11}, |
50 { 6, 8, 9, 11}, { 6, 7, 9, 10}, { 6, 7, 8, 9}, { 2, 2, 2, 2}, | 50 { 6, 8, 9, 11}, { 6, 7, 9, 10}, { 6, 7, 8, 9}, { 2, 2, 2, 2}, |
51 }; | 51 }; |
52 | 52 |
53 uint8_t ff_h264_mlps_state[4*64]; | 53 uint8_t ff_h264_mlps_state[4*64]; |
54 uint8_t ff_h264_lps_range[4][2*64]; | 54 uint8_t ff_h264_lps_range[4*2*64]; |
55 uint8_t ff_h264_lps_state[2*64]; | 55 uint8_t ff_h264_lps_state[2*64]; |
56 uint8_t ff_h264_mps_state[2*64]; | 56 uint8_t ff_h264_mps_state[2*64]; |
57 | 57 |
58 static const uint8_t mps_state[64]= { | 58 static const uint8_t mps_state[64]= { |
59 1, 2, 3, 4, 5, 6, 7, 8, | 59 1, 2, 3, 4, 5, 6, 7, 8, |
150 void ff_init_cabac_states(CABACContext *c){ | 150 void ff_init_cabac_states(CABACContext *c){ |
151 int i, j; | 151 int i, j; |
152 | 152 |
153 for(i=0; i<64; i++){ | 153 for(i=0; i<64; i++){ |
154 for(j=0; j<4; j++){ //FIXME check if this is worth the 1 shift we save | 154 for(j=0; j<4; j++){ //FIXME check if this is worth the 1 shift we save |
155 ff_h264_lps_range[j][2*i+0]= | 155 ff_h264_lps_range[j*2*64+2*i+0]= |
156 ff_h264_lps_range[j][2*i+1]= lps_range[i][j]; | 156 ff_h264_lps_range[j*2*64+2*i+1]= lps_range[i][j]; |
157 } | 157 } |
158 | 158 |
159 ff_h264_mlps_state[128+2*i+0]= | 159 ff_h264_mlps_state[128+2*i+0]= |
160 ff_h264_mps_state[2*i+0]= 2*mps_state[i]+0; | 160 ff_h264_mps_state[2*i+0]= 2*mps_state[i]+0; |
161 ff_h264_mlps_state[128+2*i+1]= | 161 ff_h264_mlps_state[128+2*i+1]= |