[Mplayer-cvslog] CVS: main/libmpdemux asf_streaming.c,1.13,1.14

[Bertrand Baudet]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mplayer:/var/tmp.root/cvs-serv5205

Modified Files:
	asf_streaming.c 
Log Message:
Fixed the multiple ASF header stream chunk.


Index: asf_streaming.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/asf_streaming.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- asf_streaming.c	16 Dec 2001 21:23:36 -0000	1.13
+++ asf_streaming.c	17 Dec 2001 01:58:24 -0000	1.14
@@ -97,7 +97,6 @@
 		r += i;
 	  }
 	  size = asf_streaming( &chunk, &r) - sizeof(ASF_stream_chunck_t);
-//printf("size=%d\n", size);
 	  if(r) printf("Warning : drop header ????\n");
 	  if(size < 0){
 	    printf("Error while parsing chunk header\n");
@@ -110,7 +109,7 @@
 	  
 	  buffer = (char*) malloc(size+buffer_size);
 	  if(buffer == NULL) {
-	    printf("Error can't allocate %d bytes buffer\n",buffer_size);
+	    printf("Error can't allocate %d bytes buffer\n",size+buffer_size);
 	    return -1;
 	  }
 	  if( chunk_buffer!=NULL ) {
@@ -129,7 +128,6 @@
 	    }
 	    r += i;
 	  }  
-//for(i=0;i<30;i++) printf(" 0x%02x", buffer[i] );
 
 	  if( chunk_size2read==0 ) {
 		if(size < (int)sizeof(asfh)) {
@@ -141,10 +139,9 @@
 		chunk_size2read = asfh.objh.size;
 		printf("Size 2 read=%d\n", chunk_size2read);
 	  }
-//printf("buffer_size=%d\n", buffer_size );
   } while( buffer_size<chunk_size2read);
   buffer = chunk_buffer;
-//for(i=0;i<30;i++) printf(" 0x%02x", buffer[i] );
+  size = buffer_size;
 	  
   if(asfh.cno > 256) {
     printf("Error sub chunks number is invalid\n");
@@ -159,7 +156,6 @@
 
     switch(ASF_LOAD_GUID_PREFIX(objh.guid)) {
     case 0x8CABDCA1 : // File header
-//printf("Found file header\n");
       pos += sizeof(objh);
       memcpy(&fileh,buffer + pos,sizeof(fileh));
       le2me_ASF_file_header_t(&fileh);
@@ -175,7 +171,6 @@
       pos += sizeof(fileh);
       break;
     case 0xB7DC0791 : // stream header
-//printf("Found stream header\n");
       pos += sizeof(objh);
       memcpy(&streamh,buffer + pos,sizeof(streamh));
       le2me_ASF_stream_header_t(&streamh);