[FFmpeg-cvslog] r10836 - trunk/libavformat/mov.c

[bcoudurier]

Author: bcoudurier
Date: Mon Oct 22 16:36:14 2007
New Revision: 10836

Log:
fix issue 225, instead of stoping when wrong atom size is found,
limit atom size to what is left, assuming container atom has correct size..
cricket4.3g2 has incorrect moov atom size which indicates that file size should be
2 bytes bigger than it is and quicktime reads it correctly though.


Modified:
   trunk/libavformat/mov.c

Modified: trunk/libavformat/mov.c
==============================================================================
--- trunk/libavformat/mov.c	(original)
+++ trunk/libavformat/mov.c	Mon Oct 22 16:36:14 2007
@@ -179,8 +179,10 @@ static int mov_read_default(MOVContext *
                 break;
         }
         a.size -= 8;
-        if(a.size < 0 || a.size > atom.size - total_size)
+        if(a.size < 0)
             break;
+        if (a.size > atom.size - total_size)
+            a.size = atom.size - total_size;
 
         for (i = 0; c->parse_table[i].type != 0L
              && c->parse_table[i].type != a.type; i++)