Mercurial > libavcodec.hg
comparison h264data.h @ 11145:8805efb4c3fd libavcodec
Move setting MB_TYPE_L0L1 for direct MBs up, this is simpler.
author | michael |
---|---|
date | Sat, 13 Feb 2010 15:57:49 +0000 |
parents | 7101061bfa0f |
children | 7dd2a45249a9 |
comparison
equal
deleted
inserted
replaced
11144:0f7dcfca7b2e | 11145:8805efb4c3fd |
---|---|
195 {MB_TYPE_8x16 |MB_TYPE_P0L0 , 2}, | 195 {MB_TYPE_8x16 |MB_TYPE_P0L0 , 2}, |
196 {MB_TYPE_8x8 |MB_TYPE_P0L0 , 4}, | 196 {MB_TYPE_8x8 |MB_TYPE_P0L0 , 4}, |
197 }; | 197 }; |
198 | 198 |
199 static const PMbInfo b_mb_type_info[23]={ | 199 static const PMbInfo b_mb_type_info[23]={ |
200 {MB_TYPE_DIRECT2 , 1, }, | 200 {MB_TYPE_DIRECT2|MB_TYPE_L0L1 , 1, }, |
201 {MB_TYPE_16x16|MB_TYPE_P0L0 , 1, }, | 201 {MB_TYPE_16x16|MB_TYPE_P0L0 , 1, }, |
202 {MB_TYPE_16x16 |MB_TYPE_P0L1 , 1, }, | 202 {MB_TYPE_16x16 |MB_TYPE_P0L1 , 1, }, |
203 {MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1 , 1, }, | 203 {MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1 , 1, }, |
204 {MB_TYPE_16x8 |MB_TYPE_P0L0 |MB_TYPE_P1L0 , 2, }, | 204 {MB_TYPE_16x8 |MB_TYPE_P0L0 |MB_TYPE_P1L0 , 2, }, |
205 {MB_TYPE_8x16 |MB_TYPE_P0L0 |MB_TYPE_P1L0 , 2, }, | 205 {MB_TYPE_8x16 |MB_TYPE_P0L0 |MB_TYPE_P1L0 , 2, }, |