[SCM] libav/experimental: Set sub_mb_type in direct_cache instead of just the direct flag. Simpler, cleaner and faster.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit a59b9ee33d2442ab89a5a367eac3bc08c6b581da
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sun Feb 14 16:51:31 2010 +0000

    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

diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c
index c0a1332..3f74818 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++ ) {

-- 
Libav/FFmpeg packaging