[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec mjpeg.c,1.123,1.124

[Michael Niedermayer CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv18710

Modified Files:
	mjpeg.c 
Log Message:
minor optimization of decode_block()


Index: mjpeg.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mjpeg.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- mjpeg.c	29 Mar 2006 01:59:24 -0000	1.123
+++ mjpeg.c	29 Mar 2006 08:41:53 -0000	1.124
@@ -1268,17 +1268,13 @@
         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 @@
                 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);