diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2010-02-16 02:51:37 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2010-02-16 02:51:37 +0000 |
| commit | 37a9719a9734da585a2372955d6bcbc7ec7efee5 (patch) | |
| tree | 44349481b0eecbe62fcb1fe286afa375ab7daa45 /libavcodec | |
| parent | 5806e8cd1f60c67d936fa44dd4421428489503f5 (diff) | |
| download | ffmpeg-37a9719a9734da585a2372955d6bcbc7ec7efee5.tar.gz | |
2 cpu cycles faster context calculation for decode_cabac_intra_mb_type()
Originally committed as revision 21845 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264_cabac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index 892a3018d7..93652282b3 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -723,9 +723,9 @@ static int decode_cabac_intra_mb_type(H264Context *h, int ctx_base, int intra_sl if(intra_slice){ int ctx=0; - if( h->left_type[0] && !IS_INTRA4x4(h->left_type[0])) + if( h->left_type[0] & (MB_TYPE_INTRA16x16|MB_TYPE_INTRA_PCM)) ctx++; - if( h->top_type && !IS_INTRA4x4(h->top_type) ) + if( h->top_type & (MB_TYPE_INTRA16x16|MB_TYPE_INTRA_PCM)) ctx++; if( get_cabac_noinline( &h->cabac, &state[ctx] ) == 0 ) return 0; /* I4x4 */ |