[SCM] libav/experimental: 2 cpu cycles faster context calculation for decode_cabac_intra_mb_type()

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 37a9719a9734da585a2372955d6bcbc7ec7efee5
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Tue Feb 16 02:51:37 2010 +0000

    2 cpu cycles faster context calculation for decode_cabac_intra_mb_type()
    
    Originally committed as revision 21845 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c
index 892a301..9365228 100644
--- a/libavcodec/h264_cabac.c
+++ b/libavcodec/h264_cabac.c
@@ -723,9 +723,9 @@ static int decode_cabac_intra_mb_type(H264Context *h, int ctx_base, int intra_sl
 
     if(intra_slice){
         int ctx=0;
-        if( h->left_type[0] && !IS_INTRA4x4(h->left_type[0]))
+        if( h->left_type[0] & (MB_TYPE_INTRA16x16|MB_TYPE_INTRA_PCM))
             ctx++;
-        if( h->top_type     && !IS_INTRA4x4(h->top_type) )
+        if( h->top_type     & (MB_TYPE_INTRA16x16|MB_TYPE_INTRA_PCM))
             ctx++;
         if( get_cabac_noinline( &h->cabac, &state[ctx] ) == 0 )
             return 0;   /* I4x4 */

-- 
Libav/FFmpeg packaging