[Mplayer-cvslog] CVS: main aviheader.c,1.4,1.5

[GEREOFFY]

Update of /cvsroot/mplayer/main
In directory usw-pr-cvs1:/tmp/cvs-serv15379

Modified Files:
	aviheader.c 
Log Message:
malloc->calloc at wf/bih allocation

Index: aviheader.c
===================================================================
RCS file: /cvsroot/mplayer/main/aviheader.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** aviheader.c	2001/04/15 14:33:49	1.4
--- aviheader.c	2001/04/15 14:45:15	1.5
***************
*** 57,62 ****
      case ckidSTREAMFORMAT: {      // read 'strf'
        if(last_fccType==streamtypeVIDEO){
!         sh_video->bih=malloc(chunksize); memset(sh_video->bih,0,chunksize);
!         if(verbose>=2) printf("found 'bih', %d bytes of %d\n",chunksize,sizeof(BITMAPINFOHEADER));
          stream_read(demuxer->stream,(char*) sh_video->bih,chunksize);
          chunksize=0;
--- 57,63 ----
      case ckidSTREAMFORMAT: {      // read 'strf'
        if(last_fccType==streamtypeVIDEO){
!         sh_video->bih=calloc((chunksize<sizeof(BITMAPINFOHEADER))?sizeof(BITMAPINFOHEADER):chunksize,1);
! //        sh_video->bih=malloc(chunksize); memset(sh_video->bih,0,chunksize);
!         if(verbose>=1) printf("found 'bih', %d bytes of %d\n",chunksize,sizeof(BITMAPINFOHEADER));
          stream_read(demuxer->stream,(char*) sh_video->bih,chunksize);
          chunksize=0;
***************
*** 66,71 ****
        } else
        if(last_fccType==streamtypeAUDIO){
!         sh_audio->wf=malloc(chunksize); memset(sh_audio->wf,0,chunksize);
!         if(verbose>=2) printf("found 'wf', %d bytes of %d\n",chunksize,sizeof(WAVEFORMATEX));
          stream_read(demuxer->stream,(char*) sh_audio->wf,chunksize);
          chunksize=0;
--- 67,73 ----
        } else
        if(last_fccType==streamtypeAUDIO){
!         sh_audio->wf=calloc((chunksize<sizeof(WAVEFORMATEX))?sizeof(WAVEFORMATEX):chunksize,1);
! //        sh_audio->wf=malloc(chunksize); memset(sh_audio->wf,0,chunksize);
!         if(verbose>=1) printf("found 'wf', %d bytes of %d\n",chunksize,sizeof(WAVEFORMATEX));
          stream_read(demuxer->stream,(char*) sh_audio->wf,chunksize);
          chunksize=0;


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog