Mercurial > mplayer.hg
changeset 3551:314987c0aaf4
Fixed the multiple ASF header stream chunk.
author | bertrand |
---|---|
date | Mon, 17 Dec 2001 01:58:24 +0000 |
parents | 6d3e5a200c84 |
children | 9ff2e3801027 |
files | libmpdemux/asf_streaming.c |
diffstat | 1 files changed, 2 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/asf_streaming.c Mon Dec 17 01:14:15 2001 +0000 +++ b/libmpdemux/asf_streaming.c Mon Dec 17 01:58:24 2001 +0000 @@ -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);