[Mplayer-cvslog] CVS: main mplayer.c,1.123,1.124

[GEREOFFY]

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

Modified Files:
	mplayer.c 
Log Message:
opendivx NEW_DECORE fixed

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -r1.123 -r1.124
*** mplayer.c	2001/05/22 23:17:31	1.123
--- mplayer.c	2001/05/24 01:19:29	1.124
***************
*** 1222,1231 ****
  #ifdef NEW_DECORE
       DEC_MEM_REQS dec_mem;
- 	dec_param.x_dim = sh_video->bih->biWidth;
- 	dec_param.y_dim = sh_video->bih->biHeight;
          dec_param.output_format=DEC_USER;
  #endif
  #ifdef NEW_DECORE
!         // 0.50-CVS
          decore(0x123, DEC_OPT_MEMORY_REQS, &dec_param, &dec_mem);
          dec_param.buffers.mp4_edged_ref_buffers=malloc(dec_mem.mp4_edged_ref_buffers_size);
--- 1222,1233 ----
  #ifdef NEW_DECORE
       DEC_MEM_REQS dec_mem;
          dec_param.output_format=DEC_USER;
+ #else
+         dec_param.color_depth = 32;
  #endif
+ 	dec_param.x_dim = sh_video->bih->biWidth;
+ 	dec_param.y_dim = sh_video->bih->biHeight;
  #ifdef NEW_DECORE
!         // 0.50-CVS new malloc scheme
          decore(0x123, DEC_OPT_MEMORY_REQS, &dec_param, &dec_mem);
          dec_param.buffers.mp4_edged_ref_buffers=malloc(dec_mem.mp4_edged_ref_buffers_size);
***************
*** 1235,1242 ****
          dec_param.buffers.mp4_tables=malloc(dec_mem.mp4_tables_size);
          dec_param.buffers.mp4_stream=malloc(dec_mem.mp4_stream_size);
- #else
-         dec_param.color_depth = 32;
  #endif
  	decore(0x123, DEC_OPT_INIT, &dec_param, NULL);
  	dec_set.postproc_level = divx_quality;
  	decore(0x123, DEC_OPT_SETPP, &dec_set, NULL);
--- 1237,1243 ----
          dec_param.buffers.mp4_tables=malloc(dec_mem.mp4_tables_size);
          dec_param.buffers.mp4_stream=malloc(dec_mem.mp4_stream_size);
  #endif
  	decore(0x123, DEC_OPT_INIT, &dec_param, NULL);
+ 
  	dec_set.postproc_level = divx_quality;
  	decore(0x123, DEC_OPT_SETPP, &dec_set, NULL);
***************
*** 1789,1793 ****
      if(in_size){
        sh_video->bih->biSizeImage = in_size;
! //      ret = ICDecompress(avi_header.hic, ICDECOMPRESS_NOTKEYFRAME|(ICDECOMPRESS_HURRYUP|ICDECOMPRESS_PREROL), 
        ret = ICDecompress(sh_video->hic, ICDECOMPRESS_NOTKEYFRAME |
                          ( (drop_frame==2)?(ICDECOMPRESS_HURRYUP|ICDECOMPRESS_PREROL):0 ) , 
--- 1790,1797 ----
      if(in_size){
        sh_video->bih->biSizeImage = in_size;
! 
!       sh_video->bih->biWidth = 1280;
!       sh_video->o_bih.biWidth = 1280;
! 	    //      ret = ICDecompress(avi_header.hic, ICDECOMPRESS_NOTKEYFRAME|(ICDECOMPRESS_HURRYUP|ICDECOMPRESS_PREROL), 
        ret = ICDecompress(sh_video->hic, ICDECOMPRESS_NOTKEYFRAME |
                          ( (drop_frame==2)?(ICDECOMPRESS_HURRYUP|ICDECOMPRESS_PREROL):0 ) , 


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