Originally committed as revision 22124 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.6
| @@ -1503,8 +1503,7 @@ decode_intra_mb: | |||||
| }else | }else | ||||
| ref=0; | ref=0; | ||||
| fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, ref, 1); | fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, ref, 1); | ||||
| }else | |||||
| fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, (uint8_t)LIST_NOT_USED, 1); //FIXME factorize and the other fill_rect below too | |||||
| } | |||||
| } | } | ||||
| for(list=0; list<h->list_count; list++){ | for(list=0; list<h->list_count; list++){ | ||||
| if(IS_DIR(mb_type, 0, list)){ | if(IS_DIR(mb_type, 0, list)){ | ||||
| @@ -1515,8 +1514,7 @@ decode_intra_mb: | |||||
| fill_rectangle(h->mvd_cache[list][ scan8[0] ], 4, 4, 8, pack8to16(mpx,mpy), 2); | fill_rectangle(h->mvd_cache[list][ scan8[0] ], 4, 4, 8, pack8to16(mpx,mpy), 2); | ||||
| fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4); | fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4); | ||||
| }else | |||||
| fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, 0, 4); | |||||
| } | |||||
| } | } | ||||
| } | } | ||||
| else if(IS_16X8(mb_type)){ | else if(IS_16X8(mb_type)){ | ||||
| @@ -789,22 +789,18 @@ decode_intra_mb: | |||||
| return -1; | return -1; | ||||
| } | } | ||||
| } | } | ||||
| }else | |||||
| val= LIST_NOT_USED&0xFF; | |||||
| fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, val, 1); | fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, val, 1); | ||||
| } | |||||
| } | } | ||||
| for(list=0; list<h->list_count; list++){ | for(list=0; list<h->list_count; list++){ | ||||
| unsigned int val; | |||||
| if(IS_DIR(mb_type, 0, list)){ | if(IS_DIR(mb_type, 0, list)){ | ||||
| pred_motion(h, 0, 4, list, h->ref_cache[list][ scan8[0] ], &mx, &my); | pred_motion(h, 0, 4, list, h->ref_cache[list][ scan8[0] ], &mx, &my); | ||||
| mx += get_se_golomb(&s->gb); | mx += get_se_golomb(&s->gb); | ||||
| my += get_se_golomb(&s->gb); | my += get_se_golomb(&s->gb); | ||||
| tprintf(s->avctx, "final mv:%d %d\n", mx, my); | tprintf(s->avctx, "final mv:%d %d\n", mx, my); | ||||
| val= pack16to32(mx,my); | |||||
| }else | |||||
| val=0; | |||||
| fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, val, 4); | |||||
| fill_rectangle(h->mv_cache[list][ scan8[0] ], 4, 4, 8, pack16to32(mx,my), 4); | |||||
| } | |||||
| } | } | ||||
| } | } | ||||
| else if(IS_16X8(mb_type)){ | else if(IS_16X8(mb_type)){ | ||||