Mercurial > libavcodec.hg

comparison rv34.c @ 12022:bf2a317342a2 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix "initialization from incompatible pointer type" warning in rv34. Patch by Eli Friedman (at gmail).
author benoit
date Wed, 30 Jun 2010 06:50:44 +0000
parents e8cf7f5fb715
children fe1a6abe310a
comparison
equal deleted inserted replaced
12021:18c23a632001 12022:bf2a317342a2
1140 static int rv34_set_deblock_coef(RV34DecContext *r) 1140 static int rv34_set_deblock_coef(RV34DecContext *r)
1141 { 1141 {
1142 MpegEncContext *s = &r->s; 1142 MpegEncContext *s = &r->s;
1143 int hmvmask = 0, vmvmask = 0, i, j; 1143 int hmvmask = 0, vmvmask = 0, i, j;
1144 int midx = s->mb_x * 2 + s->mb_y * 2 * s->b8_stride; 1144 int midx = s->mb_x * 2 + s->mb_y * 2 * s->b8_stride;
1145 int16_t (*motion_val)[2] = s->current_picture_ptr->motion_val[0][midx]; 1145 int16_t (*motion_val)[2] = &s->current_picture_ptr->motion_val[0][midx];
1146 for(j = 0; j < 16; j += 8){ 1146 for(j = 0; j < 16; j += 8){
1147 for(i = 0; i < 2; i++){ 1147 for(i = 0; i < 2; i++){
1148 if(is_mv_diff_gt_3(motion_val + i, 1)) 1148 if(is_mv_diff_gt_3(motion_val + i, 1))
1149 vmvmask |= 0x11 << (j + i*2); 1149 vmvmask |= 0x11 << (j + i*2);
1150 if((j || s->mb_y) && is_mv_diff_gt_3(motion_val + i, s->b8_stride)) 1150 if((j || s->mb_y) && is_mv_diff_gt_3(motion_val + i, s->b8_stride))