From 7d2b787daa8237480cee619e3d22bd6cf9740db4 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 29 Mar 2006 08:41:53 +0000 Subject: [PATCH] minor optimization of decode_block() Originally committed as revision 5237 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/mjpeg.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c index e6cb52a..79caa9b 100644 --- a/libavcodec/mjpeg.c +++ b/libavcodec/mjpeg.c @@ -1268,17 +1268,13 @@ static int decode_block(MJpegDecodeContext *s, DCTELEM *block, UPDATE_CACHE(re, &s->gb); GET_VLC(code, re, &s->gb, s->vlcs[1][ac_index].table, 9, 2) - if (code < 0) { - dprintf("error ac\n"); - return -1; - } /* EOB */ if (code == 0) break; if (code == 0xf0) { i += 16; } else { - i += code >> 4; + i += ((unsigned)code) >> 4; code &= 0xf; UPDATE_CACHE(re, &s->gb) @@ -1289,7 +1285,7 @@ static int decode_block(MJpegDecodeContext *s, DCTELEM *block, level = - NEG_USR32(~GET_CACHE(re,&s->gb),code); } - SKIP_BITS(re, &s->gb, code) + LAST_SKIP_BITS(re, &s->gb, code) if (i >= 64) { dprintf("error count: %d\n", i); -- 2.7.4