# HG changeset patch
# User michael
# Date 1266092034 0
# Node ID 2d5a3c03c2190fd4c5669b19525e4b7c409f26e0
# Parent  81c3f88f460fe2637b9aec9588edf1f42a3bcb6b
Merge (IS_SKIP(mb_type) || IS_DIRECT(mb_type)

diff -r 81c3f88f460f -r 2d5a3c03c219 h264.h
--- a/h264.h	Sat Feb 13 20:13:10 2010 +0000
+++ b/h264.h	Sat Feb 13 20:13:54 2010 +0000
@@ -1014,7 +1014,7 @@
                 h->ref_cache[list][scan8[0] + 4 - 1*8]= topright_type ? LIST_NOT_USED : PART_NOT_AVAILABLE;
             }
 
-            if((IS_SKIP(mb_type) || IS_DIRECT(mb_type)) && !FRAME_MBAFF)
+            if((mb_type&(MB_TYPE_SKIP|MB_TYPE_DIRECT2)) && !FRAME_MBAFF)
                 continue;
 
             if(!(mb_type&(MB_TYPE_SKIP|MB_TYPE_DIRECT2))) {