summaryrefslogtreecommitdiff
path: root/libavcodec/h264_cavlc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-02-28 23:54:24 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-02-28 23:54:24 +0000
commit8897b247a5be8533529f75e082fd53cca22ac201 (patch)
tree33f2c6749efed45a6f8eb79f40181a32527d99b6 /libavcodec/h264_cavlc.c
parent11a74f36397a088dc458cf23e93bcf71e56330ea (diff)
Remove some unneeded fill_rectangle() for 16x16 blocks.
Originally committed as revision 22124 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264_cavlc.c')
-rw-r--r--libavcodec/h264_cavlc.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c
index d83a306a5e..ef92218b4f 100644
--- a/libavcodec/h264_cavlc.c
+++ b/libavcodec/h264_cavlc.c
@@ -789,22 +789,18 @@ decode_intra_mb:
return -1;
}
}
- }else
- val= LIST_NOT_USED&0xFF;
fill_rectangle(&h->ref_cache[list][ scan8[0] ], 4, 4, 8, val, 1);
+ }
}
for(list=0; list<h->list_count; list++){
- unsigned int val;
if(IS_DIR(mb_type, 0, list)){
pred_motion(h, 0, 4, list, h->ref_cache[list][ scan8[0] ], &mx, &my);
mx += get_se_golomb(&s->gb);
my += get_se_golomb(&s->gb);
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)){