avifile-0.6-CVS merge

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@714 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 17 insertions, 0 deletions

diff --git a/dll_init.c b/dll_init.c
index ad0b6298c5..e65542d41c 100644
--- a/dll_init.c
+++ b/dll_init.c
@@ -166,6 +166,12 @@ int init_video_codec(sh_video_t *sh_video){
 //  sh_video->o_bih.biPlanes=3;
 //  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) {
 
@@ -213,7 +219,15 @@ int init_video_codec(sh_video_t *sh_video){
       return 0;
   }
 
+  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)) {
       sh_video->o_bih.biHeight=-sh_video->bih->biHeight; // flip image!
@@ -248,6 +262,7 @@ int init_video_codec(sh_video_t *sh_video){
   }
   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);
   if(ret){
@@ -255,6 +270,8 @@ int init_video_codec(sh_video_t *sh_video){
     return 0;
   }
 
+  printf("XXX size=%d\n",sh_video->o_bih.biSizeImage);
+
 #if 0
 
 //sh_video->hic