[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec mjpeg.c,1.125,1.126

[Michael Niedermayer CVS]

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

Modified Files:
	mjpeg.c 
Log Message:
avoid if(i>=63) check at the end of decode_block()


Index: mjpeg.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mjpeg.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- mjpeg.c	29 Mar 2006 09:13:43 -0000	1.125
+++ mjpeg.c	29 Mar 2006 09:20:44 -0000	1.126
@@ -1297,14 +1297,17 @@
 
             LAST_SKIP_BITS(re, &s->gb, code)
 
-            if (i >= 64) {
+            if (i >= 63) {
+                if(i == 63){
+                    j = s->scantable.permutated[63];
+                    block[j] = level * quant_matrix[j];
+                    break;
+                }
                 dprintf("error count: %d\n", i);
                 return -1;
             }
             j = s->scantable.permutated[i];
             block[j] = level * quant_matrix[j];
-            if (i >= 63)
-                break;
         }
     }
     CLOSE_READER(re, &s->gb)