Mercurial > libavcodec.hg

comparison h264.c @ 2553:48c1b17233e8 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove an assert that was breaking compilation on some gccs.
author lorenm
date Mon, 07 Mar 2005 09:05:33 +0000
parents 615995277bc5
children bfba825ee300
comparison
equal deleted inserted replaced
2552:9a7770ebed14 2553:48c1b17233e8
1270 fill_rectangle(&h-> mv_cache[0][scan8[0]], 4, 4, 8, 0, 4); 1270 fill_rectangle(&h-> mv_cache[0][scan8[0]], 4, 4, 8, 0, 4);
1271 fill_rectangle(&h-> mv_cache[1][scan8[0]], 4, 4, 8, 0, 4); 1271 fill_rectangle(&h-> mv_cache[1][scan8[0]], 4, 4, 8, 0, 4);
1272 }else{ 1272 }else{
1273 const int ref0 = l1ref0[0] >= 0 ? h->map_col_to_list0[0][l1ref0[0]] 1273 const int ref0 = l1ref0[0] >= 0 ? h->map_col_to_list0[0][l1ref0[0]]
1274 : h->map_col_to_list0[1][l1ref1[0]]; 1274 : h->map_col_to_list0[1][l1ref1[0]];
1275 assert(ref0 >= 0);
1276 const int dist_scale_factor = h->dist_scale_factor[ref0]; 1275 const int dist_scale_factor = h->dist_scale_factor[ref0];
1277 const int16_t *mv_col = l1mv0[0]; 1276 const int16_t *mv_col = l1mv0[0];
1278 int mv_l0[2]; 1277 int mv_l0[2];
1279 mv_l0[0] = (dist_scale_factor * mv_col[0] + 128) >> 8; 1278 mv_l0[0] = (dist_scale_factor * mv_col[0] + 128) >> 8;
1280 mv_l0[1] = (dist_scale_factor * mv_col[1] + 128) >> 8; 1279 mv_l0[1] = (dist_scale_factor * mv_col[1] + 128) >> 8;
1302 ref0 = l1ref0[x8 + y8*h->b8_stride]; 1301 ref0 = l1ref0[x8 + y8*h->b8_stride];
1303 if(ref0 >= 0) 1302 if(ref0 >= 0)
1304 ref0 = h->map_col_to_list0[0][ref0]; 1303 ref0 = h->map_col_to_list0[0][ref0];
1305 else 1304 else
1306 ref0 = h->map_col_to_list0[1][l1ref1[x8 + y8*h->b8_stride]]; 1305 ref0 = h->map_col_to_list0[1][l1ref1[x8 + y8*h->b8_stride]];
1307 assert(ref0 >= 0);
1308 dist_scale_factor = h->dist_scale_factor[ref0]; 1306 dist_scale_factor = h->dist_scale_factor[ref0];
1309 1307
1310 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, ref0, 1); 1308 fill_rectangle(&h->ref_cache[0][scan8[i8*4]], 2, 2, 8, ref0, 1);
1311 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, 0, 1); 1309 fill_rectangle(&h->ref_cache[1][scan8[i8*4]], 2, 2, 8, 0, 1);
1312 for(i4=0; i4<4; i4++){ 1310 for(i4=0; i4<4; i4++){