[Mplayer-cvslog] CVS: main mplayer.c,1.96,1.97 cfg-mplayer.h,1.34,1.35

[GEREOFFY]

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

Modified Files:
	mplayer.c cfg-mplayer.h 
Log Message:
-nodshow/-dshow added, -afm is working again

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -r1.96 -r1.97
*** mplayer.c	2001/04/24 00:02:20	1.96
--- mplayer.c	2001/04/24 22:51:05	1.97
***************
*** 381,384 ****
--- 381,389 ----
  //
  int audio_format=0; // override
+ #ifdef USE_DIRECTSHOW
+ int allow_dshow=1;
+ #else
+ int allow_dshow=0;
+ #endif
  #ifdef ALSA_TIMER
  int alsa=1;
***************
*** 891,901 ****
  if(has_audio){
    // Go through the codec.conf and find the best codec...
!   sh_audio->codec=find_codec(sh_audio->format,NULL,NULL,1);
!   if(!sh_audio->codec){
!     printf("Can't find codec for audio format 0x%X !\n",sh_audio->format);
!     has_audio=0;
!   } else {
      printf("Found audio codec: [%s] drv:%d (%s)\n",sh_audio->codec->name,sh_audio->codec->driver,sh_audio->codec->info);
      //has_audio=sh_audio->codec->driver;
    }
  }
--- 896,911 ----
  if(has_audio){
    // Go through the codec.conf and find the best codec...
!   sh_audio->codec=NULL;
!   while(1){
!     sh_audio->codec=find_codec(sh_audio->format,NULL,sh_audio->codec,1);
!     if(!sh_audio->codec){
!       printf("Can't find codec for audio format 0x%X !\n",sh_audio->format);
!       has_audio=0;
!       break;
!     }
!     if(audio_format>0 && sh_audio->codec->driver!=audio_format) continue;
      printf("Found audio codec: [%s] drv:%d (%s)\n",sh_audio->codec->name,sh_audio->codec->driver,sh_audio->codec->info);
      //has_audio=sh_audio->codec->driver;
+     break;
    }
  }
***************
*** 914,922 ****
  
  // Go through the codec.conf and find the best codec...
! sh_video->codec=find_codec(sh_video->format,
!     sh_video->bih?((unsigned int*) &sh_video->bih->biCompression):NULL,NULL,0);
! if(!sh_video->codec){
      printf("Can't find codec for video format 0x%X !\n",sh_video->format);
      exit(1);
  }
  //has_video=sh_video->codec->driver;
--- 924,937 ----
  
  // Go through the codec.conf and find the best codec...
! sh_video->codec=NULL;
! while(1){
!   sh_video->codec=find_codec(sh_video->format,
!     sh_video->bih?((unsigned int*) &sh_video->bih->biCompression):NULL,sh_video->codec,0);
!   if(!sh_video->codec){
      printf("Can't find codec for video format 0x%X !\n",sh_video->format);
      exit(1);
+   }
+   if(!allow_dshow && sh_video->codec->driver==4) continue; // skip DShow
+   break;
  }
  //has_video=sh_video->codec->driver;

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** cfg-mplayer.h	2001/04/23 03:38:17	1.34
--- cfg-mplayer.h	2001/04/24 22:51:05	1.35
***************
*** 76,79 ****
--- 76,81 ----
  	{"fps", &force_fps, CONF_TYPE_FLOAT, CONF_MIN, 0, 0},
  	{"afm", &audio_format, CONF_TYPE_INT, CONF_RANGE, 1, 6},
+ 	{"dshow", &allow_dshow, CONF_TYPE_FLAG, 0, 0, 1},
+ 	{"nodshow", &allow_dshow, CONF_TYPE_FLAG, 0, 1, 0},
  	{"vcd", &vcd_track, CONF_TYPE_INT, CONF_RANGE, 1, 99},
  	{"divxq", "Option -divxq has been renamed to -pp (postprocessing), use -pp !\n",


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