diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-02-28 23:54:24 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-02-28 23:54:24 +0000 |
| commit | 8897b247a5be8533529f75e082fd53cca22ac201 (patch) | |
| tree | 33f2c6749efed45a6f8eb79f40181a32527d99b6 | |
| parent | 11a74f36397a088dc458cf23e93bcf71e56330ea (diff) | |
| download | ffmpeg-8897b247a5be8533529f75e082fd53cca22ac201.tar.gz | |
Remove some unneeded fill_rectangle() for 16x16 blocks.
Originally committed as revision 22124 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h264_cabac.c | 6 | ||||
| -rw-r--r-- | libavcodec/h264_cavlc.c | 10 |
2 files changed, 5 insertions, 11 deletions
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index 9ae695ca08..b1b919a250 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -1503,8 +1503,7 @@ decode_intra_mb: }else ref=0; 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++){ 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->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)){ 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)){ |