switch back to (amvd>2)+(amvd>32), its 5 cpu cycles faster now.
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Feb 2010 18:16:48 +0000 (18:16 +0000)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Feb 2010 18:16:48 +0000 (18:16 +0000)
Originally committed as revision 22032 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/h264_cabac.c

index 47a308f..a7e4b46 100644 (file)
@@ -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;