[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec lzo.c,1.2,1.3

[Reimar Döffinger CVS]

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

Modified Files:
	lzo.c 
Log Message:
Wrong state handling causing decompression errors in some cases


Index: lzo.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/lzo.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lzo.c	12 Jan 2006 22:43:15 -0000	1.2
+++ lzo.c	14 Jan 2006 12:55:20 -0000	1.3
@@ -118,7 +118,6 @@
     while (!c.error) {
         int cnt, back;
         if (x >> 4) {
-            state = BACKPTR;
             if (x >> 6) {
                 cnt = (x >> 5) - 1;
                 back = (get_byte(&c) << 3) + ((x >> 2) & 7) + 1;
@@ -155,10 +154,9 @@
         }
         copy_backptr(&c, back, cnt + 2);
         cnt = x & 3;
+        state = cnt ? BACKPTR : COPY;
         if (cnt)
             copy(&c, cnt);
-        else
-            state = (state == COPY) ? BACKPTR : COPY;
         x = get_byte(&c);
     }
     *inlen = c.in_end - c.in;