[FFmpeg-cvslog] r18117 - trunk/libavformat/rmdec.c

[rbultje]

Author: rbultje
Date: Sat Mar 21 20:18:07 2009
New Revision: 18117

Log:
Move "- 12" statement up a bit. See "[PATCH] rmdec.c: prevent zero-length
packets" thread.

Modified:
   trunk/libavformat/rmdec.c

Modified: trunk/libavformat/rmdec.c
==============================================================================
--- trunk/libavformat/rmdec.c	Sat Mar 21 18:28:38 2009	(r18116)
+++ trunk/libavformat/rmdec.c	Sat Mar 21 20:18:07 2009	(r18117)
@@ -536,16 +536,13 @@ static int sync(AVFormatContext *s, int6
 
             if(state > (unsigned)0xFFFF || state < 12)
                 continue;
-            len=state;
+            len=state - 12;
             state= 0xFFFFFFFF;
 
             num = get_be16(pb);
             *timestamp = get_be32(pb);
             res= get_byte(pb); /* reserved */
             *flags = get_byte(pb); /* flags */
-
-
-            len -= 12;
         }
         for(i=0;i<s->nb_streams;i++) {
             st = s->streams[i];