Mercurial > libavcodec.hg

comparison indeo3.c @ 8314:e983153e2d72 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace 'typedef struct ustr_t' by 'struct ustr', _t is POSIX namespace.
author diego
date Sat, 13 Dec 2008 13:34:59 +0000
parents d9faf3f9f379
children fa328586b9ce
comparison
equal deleted inserted replaced
8313:2eaafc02cd3d 8314:e983153e2d72
145 av_free(s->buf); 145 av_free(s->buf);
146 av_free(s->ModPred); 146 av_free(s->ModPred);
147 av_free(s->corrector_type); 147 av_free(s->corrector_type);
148 } 148 }
149 149
150 typedef struct { 150 struct ustr {
151 long xpos; 151 long xpos;
152 long ypos; 152 long ypos;
153 long width; 153 long width;
154 long height; 154 long height;
155 long split_flag; 155 long split_flag;
156 long split_direction; 156 long split_direction;
157 long usl7; 157 long usl7;
158 } ustr_t; 158 };
159 159
160 160
161 #define LV1_CHECK(buf1,rle_v3,lv1,lp2) \ 161 #define LV1_CHECK(buf1,rle_v3,lv1,lp2) \
162 if((lv1 & 0x80) != 0) { \ 162 if((lv1 & 0x80) != 0) { \
163 if(rle_v3 != 0) \ 163 if(rle_v3 != 0) \
211 const signed char *ref_vectors; 211 const signed char *ref_vectors;
212 uint8_t *cur_frm_pos, *ref_frm_pos, *cp, *cp2; 212 uint8_t *cur_frm_pos, *ref_frm_pos, *cp, *cp2;
213 uint32_t *cur_lp, *ref_lp; 213 uint32_t *cur_lp, *ref_lp;
214 const uint32_t *correction_lp[2], *correctionloworder_lp[2], *correctionhighorder_lp[2]; 214 const uint32_t *correction_lp[2], *correctionloworder_lp[2], *correctionhighorder_lp[2];
215 uint8_t *correction_type_sp[2]; 215 uint8_t *correction_type_sp[2];
216 ustr_t strip_tbl[20], *strip; 216 struct ustr strip_tbl[20], *strip;
217 int i, j, k, lp1, lp2, flag1, cmd, blks_width, blks_height, region_160_width, 217 int i, j, k, lp1, lp2, flag1, cmd, blks_width, blks_height, region_160_width,
218 rle_v1, rle_v2, rle_v3; 218 rle_v1, rle_v2, rle_v3;
219 unsigned short res; 219 unsigned short res;
220 220
221 bit_buf = 0; 221 bit_buf = 0;
250 bit_pos -= 2; 250 bit_pos -= 2;
251 cmd = (bit_buf >> bit_pos) & 0x03; 251 cmd = (bit_buf >> bit_pos) & 0x03;
252 252
253 if(cmd == 0) { 253 if(cmd == 0) {
254 strip++; 254 strip++;
255 memcpy(strip, strip-1, sizeof(ustr_t)); 255 memcpy(strip, strip-1, sizeof(struct ustr));
256 strip->split_flag = 1; 256 strip->split_flag = 1;
257 strip->split_direction = 0; 257 strip->split_direction = 0;
258 strip->height = (strip->height > 8 ? ((strip->height+8)>>4)<<3 : 4); 258 strip->height = (strip->height > 8 ? ((strip->height+8)>>4)<<3 : 4);
259 continue; 259 continue;
260 } else if(cmd == 1) { 260 } else if(cmd == 1) {
261 strip++; 261 strip++;
262 memcpy(strip, strip-1, sizeof(ustr_t)); 262 memcpy(strip, strip-1, sizeof(struct ustr));
263 strip->split_flag = 1; 263 strip->split_flag = 1;
264 strip->split_direction = 1; 264 strip->split_direction = 1;
265 strip->width = (strip->width > 8 ? ((strip->width+8)>>4)<<3 : 4); 265 strip->width = (strip->width > 8 ? ((strip->width+8)>>4)<<3 : 4);
266 continue; 266 continue;
267 } else if(cmd == 2) { 267 } else if(cmd == 2) {