[SCM] libav/experimental: Merge (IS_SKIP(mb_type) || IS_DIRECT(mb_type)

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit bb770c5b522bdd81b65ea4391579e5ebdd62a047
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sat Feb 13 20:13:54 2010 +0000

    Merge (IS_SKIP(mb_type) || IS_DIRECT(mb_type)
    
    Originally committed as revision 21812 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index ae95e59..d8dbff7 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264.h
@@ -1014,7 +1014,7 @@ static void fill_decode_caches(H264Context *h, int mb_type){
                 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))) {

-- 
Libav/FFmpeg packaging