# HG changeset patch
# User michael
# Date 1265564422 0
# Node ID 64c36264b13fd2f095bbcc64ccc5f440fda75120
# Parent  74748a220032d40c101dfe6b1764e676cb0a5ebc
Set direct MB partitioning for 16x8 and 8x16 colocated MBs to the respective true partitioning.

diff -r 74748a220032 -r 64c36264b13f h264_direct.c
--- a/h264_direct.c	Sun Feb 07 17:15:17 2010 +0000
+++ b/h264_direct.c	Sun Feb 07 17:40:22 2010 +0000
@@ -193,6 +193,9 @@
             }else if(!is_b8x8 && (mb_type_col[0] & MB_TYPE_16x16_OR_INTRA)){
                 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */
                 *mb_type   |= MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_16x16 */
+            }else if(!is_b8x8 && (mb_type_col[0] & (MB_TYPE_16x8|MB_TYPE_8x16))){
+                sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */
+                *mb_type   |= MB_TYPE_L0L1|MB_TYPE_DIRECT2 | (mb_type_col[0] & (MB_TYPE_16x8|MB_TYPE_8x16));
             }else{
                 sub_mb_type = MB_TYPE_16x16|MB_TYPE_P0L0|MB_TYPE_P0L1|MB_TYPE_DIRECT2; /* B_SUB_8x8 */
                 *mb_type   |= MB_TYPE_8x8|MB_TYPE_L0L1;