[SCM] libav/experimental: switch back to (amvd>2)+(amvd>32), its 5 cpu cycles faster now.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 855a1ba5e8a477cc07f6d804a95f2ba9c74dec8c
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Wed Feb 24 18:16:48 2010 +0000

    switch back to (amvd>2)+(amvd>32), its 5 cpu cycles faster now.
    
    Originally committed as revision 22032 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c
index 47a308f..a7e4b46 100644
--- a/libavcodec/h264_cabac.c
+++ b/libavcodec/h264_cabac.c
@@ -912,7 +912,7 @@ static int decode_cabac_mb_ref( H264Context *h, int list, int n ) {
 static int decode_cabac_mb_mvd( H264Context *h, int ctxbase, int amvd ) {
     int mvd;
 
-    if(!get_cabac(&h->cabac, &h->cabac_state[ctxbase+FFMIN(((amvd+28)*17)>>9,2)]))
+    if(!get_cabac(&h->cabac, &h->cabac_state[ctxbase+(amvd>2)+(amvd>32)]))
         return 0;
 
     mvd= 1;

-- 
Libav/FFmpeg packaging