From a59b9ee33d2442ab89a5a367eac3bc08c6b581da Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Sun, 14 Feb 2010 16:51:31 +0000
Subject: [PATCH] Set sub_mb_type in direct_cache instead of just the direct
flag. Simpler, cleaner and faster.
Originally committed as revision 21822 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/h264_cabac.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c
index c0a1332a4d2..3f74818f6b9 100644
--- a/libavcodec/h264_cabac.c
+++ b/libavcodec/h264_cabac.c
@@ -1447,11 +1447,8 @@ decode_intra_mb:
h->ref_cache[1][scan8[4]] =
h->ref_cache[0][scan8[12]] =
h->ref_cache[1][scan8[12]] = PART_NOT_AVAILABLE;
- if( h->ref_count[0] > 1 || h->ref_count[1] > 1 ) {
for( i = 0; i < 4; i++ )
- if( IS_DIRECT(h->sub_mb_type[i]) )
- fill_rectangle( &h->direct_cache[scan8[4*i]], 2, 2, 8, MB_TYPE_DIRECT2>>1, 1 );
- }
+ fill_rectangle( &h->direct_cache[scan8[4*i]], 2, 2, 8, (h->sub_mb_type[i]>>1)&0xFF, 1 );
}
} else {
for( i = 0; i < 4; i++ ) {
--
GitLab