From cf7b67bc40d22694f13988d261b92de23493a810 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 26 Feb 2010 15:03:00 +0000 Subject: [PATCH] Remove some useless operations from the code setting left_cbp. maybe 0.5 cpu cycles faster Originally committed as revision 22078 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h264.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 5d615cfb63..1ef7403a86 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -952,9 +952,9 @@ static void fill_decode_caches(H264Context *h, int mb_type){ } // left_cbp if (left_type[0]) { - h->left_cbp = h->cbp_table[left_xy[0]] & 0x1f0; - h->left_cbp |= ((h->cbp_table[left_xy[0]]>>((left_block[0]&(~1))+1))&0x1) << 1; - h->left_cbp |= ((h->cbp_table[left_xy[1]]>>((left_block[2]&(~1))+1))&0x1) << 3; + h->left_cbp = (h->cbp_table[left_xy[0]] & 0x1f0) + | ((h->cbp_table[left_xy[0]]>>(left_block[0]&(~1)))&2) + | (((h->cbp_table[left_xy[1]]>>(left_block[2]&(~1)))&2) << 2); } else { h->left_cbp = IS_INTRA(mb_type) ? 0x1CF : 0x00F; }