summaryrefslogtreecommitdiff
path: root/libavcodec/h264_cabac.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-02-24 18:16:48 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-02-24 18:16:48 +0000
commit855a1ba5e8a477cc07f6d804a95f2ba9c74dec8c (patch)
tree4a98a5369d986f8293cc38553306aca4d7db2bbf /libavcodec/h264_cabac.c
parent531d8fa3087101d62400273416d8d5f83c062534 (diff)
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
Diffstat (limited to 'libavcodec/h264_cabac.c')
-rw-r--r--libavcodec/h264_cabac.c2
1 files changed, 1 insertions, 1 deletions
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;