[FFmpeg-cvslog] r21812 - trunk/libavcodec/h264.h

[michael]

Author: michael
Date: Sat Feb 13 21:13:54 2010
New Revision: 21812

Log:
Merge (IS_SKIP(mb_type) || IS_DIRECT(mb_type)

Modified:
   trunk/libavcodec/h264.h

Modified: trunk/libavcodec/h264.h
==============================================================================
--- trunk/libavcodec/h264.h	Sat Feb 13 21:13:10 2010	(r21811)
+++ trunk/libavcodec/h264.h	Sat Feb 13 21:13:54 2010	(r21812)
@@ -1014,7 +1014,7 @@ static void fill_decode_caches(H264Conte
                 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))) {