summaryrefslogtreecommitdiff
path: root/libavcodec/h264_cavlc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-01-24 20:54:09 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-01-24 20:54:09 +0000
commit996b099a0f63dcd5faba5201487c0788a252dc85 (patch)
tree8af3ba0770a52c031b5197356cff1644b22746d3 /libavcodec/h264_cavlc.c
parent81afcf1fae1f04573d65f3f4ecb0e0b3c60fb1c0 (diff)
Branchless setting of MB_TYPE_8x8DCT.
Not benchmarked as i failed to find a sample that uses this one. But it should be faster. Originally committed as revision 21435 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264_cavlc.c')
-rw-r--r--libavcodec/h264_cavlc.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c
index 0afabfc6e8..d5a9f57666 100644
--- a/libavcodec/h264_cavlc.c
+++ b/libavcodec/h264_cavlc.c
@@ -904,9 +904,7 @@ decode_intra_mb:
}
if(dct8x8_allowed && (cbp&15) && !IS_INTRA(mb_type)){
- if(get_bits1(&s->gb)){
- mb_type |= MB_TYPE_8x8DCT;
- }
+ mb_type |= MB_TYPE_8x8DCT*get_bits1(&s->gb);
}
h->cbp=
h->cbp_table[mb_xy]= cbp;