[Mplayer-cvslog] CVS: main dll_init.c,1.14,1.15

[GEREOFFY]

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

Modified Files:
	dll_init.c 
Log Message:
avifile-0.6-CVS merge

Index: dll_init.c
===================================================================
RCS file: /cvsroot/mplayer/main/dll_init.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** dll_init.c	2001/04/25 01:27:30	1.14
--- dll_init.c	2001/05/06 21:43:45	1.15
***************
*** 167,170 ****
--- 167,176 ----
  //  sh_video->o_bih.biBitCount=16;
  
+ #if 0
+   // workaround for pegasus MJPEG:
+   if(!sh_video->o_bih.biWidth) sh_video->o_bih.biWidth=sh_video->bih->biWidth;
+   if(!sh_video->o_bih.biHeight) sh_video->o_bih.biHeight=sh_video->bih->biHeight;
+   if(!sh_video->o_bih.biPlanes) sh_video->o_bih.biPlanes=sh_video->bih->biPlanes;
+ #endif
  
    switch (outfmt) {
***************
*** 214,218 ****
--- 220,232 ----
    }
  
+   printf("XXX w=%d  h=%d  b=%d\n",
+         sh_video->o_bih.biWidth,
+         sh_video->o_bih.biHeight,
+         sh_video->o_bih.biBitCount/8
+   );
+ 
    sh_video->o_bih.biSizeImage = sh_video->o_bih.biWidth * sh_video->o_bih.biHeight * (sh_video->o_bih.biBitCount/8);
+   
+   printf("XXX size=%d\n",sh_video->o_bih.biSizeImage);
  
    if(!(sh_video->codec->outflags[sh_video->outfmtidx]&CODECS_FLAG_FLIP)) {
***************
*** 249,252 ****
--- 263,267 ----
    if(verbose) printf("ICDecompressQuery OK\n");
  
+   printf("XXX size=%d\n",sh_video->o_bih.biSizeImage);
    
    ret = ICDecompressBegin(sh_video->hic, sh_video->bih, &sh_video->o_bih);
***************
*** 255,258 ****
--- 270,275 ----
      return 0;
    }
+ 
+   printf("XXX size=%d\n",sh_video->o_bih.biSizeImage);
  
  #if 0


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