[FFmpeg-cvslog] r9807 - trunk/libavformat/asf.c

[michael]

Author: michael
Date: Fri Jul 27 02:29:33 2007
New Revision: 9807

Log:
ignore invalid packet_obj_size
fixes video5.asf


Modified:
   trunk/libavformat/asf.c

Modified: trunk/libavformat/asf.c
==============================================================================
--- trunk/libavformat/asf.c	(original)
+++ trunk/libavformat/asf.c	Fri Jul 27 02:29:33 2007
@@ -773,6 +773,15 @@ static int asf_read_packet(AVFormatConte
             asf->packet_multi_size -= asf->packet_obj_size;
             //printf("COMPRESS size  %d  %d  %d   ms:%d\n", asf->packet_obj_size, asf->packet_frag_timestamp, asf->packet_size_left, asf->packet_multi_size);
         }
+        if(   /*asf->packet_frag_size == asf->packet_obj_size*/
+              asf_st->frag_offset + asf->packet_frag_size <= asf_st->pkt.size
+           && asf_st->frag_offset + asf->packet_frag_size > asf->packet_obj_size){
+            av_log(s, AV_LOG_INFO, "ignoring invalid packet_obj_size (%d %d %d %d)\n",
+                asf_st->frag_offset, asf->packet_frag_size,
+                asf->packet_obj_size, asf_st->pkt.size);
+            asf->packet_obj_size= asf_st->pkt.size;
+        }
+
         if (   asf_st->pkt.size != asf->packet_obj_size
             || asf_st->frag_offset + asf->packet_frag_size > asf_st->pkt.size) { //FIXME is this condition sufficient?
             if(asf_st->pkt.data){