From bb770c5b522bdd81b65ea4391579e5ebdd62a047 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 13 Feb 2010 20:13:54 +0000 Subject: [PATCH] Merge (IS_SKIP(mb_type) || IS_DIRECT(mb_type) Originally committed as revision 21812 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h264.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264.h b/libavcodec/h264.h index ae95e5984f..d8dbff7cfd 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))) {