From 7cfca0dfd858512a10ee9bb21e7ecca58bb88330 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 19 Dec 2008 01:50:20 +0000 Subject: [PATCH] Simplify ctx calculation in decode_cabac_mb_dqp() no speed change Originally committed as revision 16231 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h264.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 4f65d85f32..729412324d 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -4955,12 +4955,9 @@ static int decode_cabac_mb_cbp_chroma( H264Context *h) { return 1 + get_cabac_noinline( &h->cabac, &h->cabac_state[77 + ctx] ); } static int decode_cabac_mb_dqp( H264Context *h) { - int ctx = 0; + int ctx= h->last_qscale_diff != 0; int val = 0; - if( h->last_qscale_diff != 0 ) - ctx++; - while( get_cabac_noinline( &h->cabac, &h->cabac_state[60 + ctx] ) ) { if( ctx < 2 ) ctx = 2;