[Mplayer-cvslog] CVS: main cfg-mplayer.h,1.17,1.18 mplayer.c,1.51,1.52

[GEREOFFY]

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

Modified Files:
	cfg-mplayer.h mplayer.c 
Log Message:
-bpp changes

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** cfg-mplayer.h	2001/04/13 11:15:25	1.17
--- cfg-mplayer.h	2001/04/13 13:47:36	1.18
***************
*** 32,36 ****
  	{"nobg", &play_in_bg, CONF_TYPE_FLAG, 0, 1, 0},
  	{"sb", &seek_to_byte, CONF_TYPE_INT, CONF_MIN, 0, 0},
! 	{"ss", &seek_to_sec, CONF_TYPE_INT, CONF_MIN, 0, 0},
  	{"sound", &has_audio, CONF_TYPE_FLAG, 0, 0, 1},
  	{"nosound", &has_audio, CONF_TYPE_FLAG, 0, 1, 0},
--- 32,36 ----
  	{"nobg", &play_in_bg, CONF_TYPE_FLAG, 0, 1, 0},
  	{"sb", &seek_to_byte, CONF_TYPE_INT, CONF_MIN, 0, 0},
! //	{"ss", &seek_to_sec, CONF_TYPE_INT, CONF_MIN, 0, 0},
  	{"sound", &has_audio, CONF_TYPE_FLAG, 0, 0, 1},
  	{"nosound", &has_audio, CONF_TYPE_FLAG, 0, 1, 0},
***************
*** 66,70 ****
          {"nozoom", &softzoom, CONF_TYPE_FLAG, 0, 1, 0},
         
!         {"bpp", &user_bpp, CONF_TYPE_INT, CONF_RANGE, 0, 32},
  	
  	{"idx", &no_index, CONF_TYPE_FLAG, 0, 1, 0},
--- 66,70 ----
          {"nozoom", &softzoom, CONF_TYPE_FLAG, 0, 1, 0},
         
!         {"bpp", &vo_dbpp, CONF_TYPE_INT, CONF_RANGE, 0, 32},
  	
  	{"idx", &no_index, CONF_TYPE_FLAG, 0, 1, 0},

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -r1.51 -r1.52
*** mplayer.c	2001/04/13 11:14:12	1.51
--- mplayer.c	2001/04/13 13:47:36	1.52
***************
*** 434,438 ****
  float sub_delay=0;
  float sub_fps=0;
! int user_bpp=0;
  #include "cfg-mplayer.h"
  
--- 434,438 ----
  float sub_delay=0;
  float sub_fps=0;
! //int user_bpp=0;
  #include "cfg-mplayer.h"
  
***************
*** 859,873 ****
  printf("Found video codec: [%s] drv:%d (%s)\n",sh_video->codec->name,sh_video->codec->driver,sh_video->codec->info);
  
! if(user_bpp)printf("Trying user defined depth of %dbpp\n", user_bpp);
  
  for(i=0;i<CODECS_MAX_OUTFMT;i++){
      out_fmt=sh_video->codec->outfmt[i];
!     if(user_bpp){
!         if( ((out_fmt & IMGFMT_BGR_MASK) == IMGFMT_BGR) && ((out_fmt & 0xff) == user_bpp) || (out_fmt & IMGFMT_BGR_MASK) != IMGFMT_BGR){
! 	     if(video_out->query_format(out_fmt)) break;
! 	}
!     }else{
    	  if(video_out->query_format(out_fmt)) break;
!     }
  }
  if(i>=CODECS_MAX_OUTFMT){
--- 859,873 ----
  printf("Found video codec: [%s] drv:%d (%s)\n",sh_video->codec->name,sh_video->codec->driver,sh_video->codec->info);
  
! //if(user_bpp)printf("Trying user defined depth of %dbpp\n", user_bpp);
  
  for(i=0;i<CODECS_MAX_OUTFMT;i++){
      out_fmt=sh_video->codec->outfmt[i];
! //    if(user_bpp){
! //        if( ((out_fmt & IMGFMT_BGR_MASK) == IMGFMT_BGR) && ((out_fmt & 0xff) == user_bpp) || (out_fmt & IMGFMT_BGR_MASK) != IMGFMT_BGR){
! //	     if(video_out->query_format(out_fmt)) break;
! //	}
! //    }else{
    	  if(video_out->query_format(out_fmt)) break;
! //    }
  }
  if(i>=CODECS_MAX_OUTFMT){


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