From 855a1ba5e8a477cc07f6d804a95f2ba9c74dec8c Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 24 Feb 2010 18:16:48 +0000 Subject: [PATCH] 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 --- libavcodec/h264_cabac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index 47a308f892..a7e4b46679 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;