diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-02-13 19:00:51 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-02-13 19:00:51 +0000 |
| commit | cb9285a24626723f7f99072647d47ebfda2c77c0 (patch) | |
| tree | 39d7b64f15a6a0d6eaee259bb3fd9eac3732e26f | |
| parent | 161e8cf42c1a42b1a60f94f745d1b053cb910959 (diff) | |
| download | ffmpeg-cb9285a24626723f7f99072647d47ebfda2c77c0.tar.gz | |
Move more code under if(!IS_DIRECT(mb_type)).
Originally committed as revision 21806 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h264.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 7e0180acf5..4ba8ecb2a9 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -1015,6 +1015,7 @@ static void fill_decode_caches(H264Context *h, int mb_type){ if((IS_SKIP(mb_type) || IS_DIRECT(mb_type)) && !FRAME_MBAFF) continue; + if(!IS_DIRECT(mb_type)) { h->ref_cache[list][scan8[5 ]+1] = h->ref_cache[list][scan8[7 ]+1] = h->ref_cache[list][scan8[13]+1] = //FIXME remove past 3 (init somewhere else) @@ -1026,7 +1027,7 @@ static void fill_decode_caches(H264Context *h, int mb_type){ *(uint32_t*)h->mv_cache [list][scan8[4 ]]= *(uint32_t*)h->mv_cache [list][scan8[12]]= 0; - if( CABAC && !IS_DIRECT(mb_type)) { + if( CABAC ) { /* XXX beurk, Load mvd */ if(USES_LIST(top_type, list)){ const int b_xy= h->mb2b_xy[top_xy] + 3*h->b_stride; @@ -1084,7 +1085,7 @@ static void fill_decode_caches(H264Context *h, int mb_type){ h->direct_cache[scan8[0] - 1 + 2*8]= 0; } } - + } if(FRAME_MBAFF){ #define MAP_MVS\ MAP_F2F(scan8[0] - 1 - 1*8, topleft_type)\ |