diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-02-13 20:13:54 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-02-13 20:13:54 +0000 |
| commit | bb770c5b522bdd81b65ea4391579e5ebdd62a047 (patch) | |
| tree | 56e5e3fb100cc4e57f5427a994d99e74dfd465b2 | |
| parent | 2e4362af14d01ebe64d13357218aa67ae0358034 (diff) | |
| download | ffmpeg-bb770c5b522bdd81b65ea4391579e5ebdd62a047.tar.gz | |
Merge (IS_SKIP(mb_type) || IS_DIRECT(mb_type)
Originally committed as revision 21812 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/h264.h | 2 |
1 files changed, 1 insertions, 1 deletions
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))) { |