Mercurial > libavcodec.hg
comparison h264.h @ 11159:2d5a3c03c219 libavcodec
Merge (IS_SKIP(mb_type) || IS_DIRECT(mb_type)
author | michael |
---|---|
date | Sat, 13 Feb 2010 20:13:54 +0000 |
parents | 81c3f88f460f |
children | 1fa88821c2a8 |
comparison
equal
deleted
inserted
replaced
11158:81c3f88f460f | 11159:2d5a3c03c219 |
---|---|
1012 }else{ | 1012 }else{ |
1013 *(uint32_t*)h->mv_cache [list][scan8[0] + 4 - 1*8]= 0; | 1013 *(uint32_t*)h->mv_cache [list][scan8[0] + 4 - 1*8]= 0; |
1014 h->ref_cache[list][scan8[0] + 4 - 1*8]= topright_type ? LIST_NOT_USED : PART_NOT_AVAILABLE; | 1014 h->ref_cache[list][scan8[0] + 4 - 1*8]= topright_type ? LIST_NOT_USED : PART_NOT_AVAILABLE; |
1015 } | 1015 } |
1016 | 1016 |
1017 if((IS_SKIP(mb_type) || IS_DIRECT(mb_type)) && !FRAME_MBAFF) | 1017 if((mb_type&(MB_TYPE_SKIP|MB_TYPE_DIRECT2)) && !FRAME_MBAFF) |
1018 continue; | 1018 continue; |
1019 | 1019 |
1020 if(!(mb_type&(MB_TYPE_SKIP|MB_TYPE_DIRECT2))) { | 1020 if(!(mb_type&(MB_TYPE_SKIP|MB_TYPE_DIRECT2))) { |
1021 h->ref_cache[list][scan8[5 ]+1] = | 1021 h->ref_cache[list][scan8[5 ]+1] = |
1022 h->ref_cache[list][scan8[7 ]+1] = | 1022 h->ref_cache[list][scan8[7 ]+1] = |