[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec mpegvideo.c,1.507,1.508

Michael Niedermayer CVS michael
Sat Feb 4 23:18:48 CET 2006


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

Modified Files:
	mpegvideo.c 
Log Message:
simplify


Index: mpegvideo.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/mpegvideo.c,v
retrieving revision 1.507
retrieving revision 1.508
diff -u -d -r1.507 -r1.508
--- mpegvideo.c	4 Feb 2006 20:32:02 -0000	1.507
+++ mpegvideo.c	4 Feb 2006 22:18:45 -0000	1.508
@@ -237,20 +237,18 @@
         if(tmp == 0x100 || p==end)
             return p;
     }
-    p--;   // need to recheck or might miss one
-    end--; // we need the byte after 00 00 01 too
 
     while(p<end){
-        if     (p[ 0] > 1) p+= 3;
-        else if(p[-1]    ) p+= 2;
-        else if(p[-2]|(p[0]-1)) p++;
+        if     (p[-1] > 1      ) p+= 3;
+        else if(p[-2]          ) p+= 2;
+        else if(p[-3]|(p[-1]-1)) p++;
         else{
             p++;
             break;
         }
     }
 
-    p= FFMIN(p, end)-3;
+    p= FFMIN(p, end)-4;
     *state=  be2me_32(unaligned32(p));
 
     return p+4;





More information about the ffmpeg-cvslog mailing list