From b566bd65e211beecfc7fbeb22bae732d3a5d26a4 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 13 Oct 2006 16:19:15 +0000
Subject: [PATCH] simplify escape decoding
Originally committed as revision 6685 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/h264.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 59a5b1faeed..37e373f1ef1 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -6164,14 +6164,14 @@ static int decode_cabac_residual( H264Context *h, DCTELEM *block, int cat, int n
if( coeff_abs >= 15 ) {
int j = 0;
while( get_cabac_bypass( &h->cabac ) ) {
- coeff_abs += 1 << j;
j++;
}
+ coeff_abs=1;
while( j-- ) {
- if( get_cabac_bypass( &h->cabac ) )
- coeff_abs += 1 << j ;
+ coeff_abs += coeff_abs + get_cabac_bypass( &h->cabac );
}
+ coeff_abs+= 14;
}
if( !qmul ) {
--
GitLab