comparison mplayer.c @ 1285:202d9e2dc202

-vcodec option (maybe some other name would be better though) to select between driver types without editing codecs.conf. mplayer will default to normal codec search loop if it does not find codec for the specified driver type. config range checking for the parameter (an integer) should be cleaned, IMHO

1284:c11ca3d1a6e9

char *seek_to_sec=NULL;
int seek_to_byte=0;
int has_audio=1;
//int has_video=1;
int audio_format=0; // override

#ifdef USE_DIRECTSHOW
int allow_dshow=1;
#else
int allow_dshow=0;

//================== Init VIDEO (codec & libvo) ==========================

// 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);
      printf("*** Try to upgrade %s from DOCS/codecs.conf\n",get_path("codecs.conf"));
      printf("*** If it's still not OK, then read DOCS/CODECS!\n");
    #ifdef HAVE_GUI
     if ( !nogui )

       usec_sleep( 10000 );
      }
    #endif
    exit(1);
  }
  if(!allow_dshow && sh_video->codec->driver==4) continue; // skip DShow
  break;
}
//has_video=sh_video->codec->driver;

1285:202d9e2dc202

char *seek_to_sec=NULL;
int seek_to_byte=0;
int has_audio=1;
//int has_video=1;
int audio_format=0; // override

int force_vcodec=-1;

#ifdef USE_DIRECTSHOW
int allow_dshow=1;
#else
int allow_dshow=0;

//================== Init VIDEO (codec & libvo) ==========================

// Go through the codec.conf and find the best codec...
sh_video->codec=NULL;
if (force_vcodec!=-1) printf("Trying to use forced video codec driver %d ...\n",force_vcodec);
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){
    if(force_vcodec!=-1) {
      sh_video->codec=NULL; /* re-search */
      printf("Can't find video codec for forced driver %d, defaulting to other drivers.\n",force_vcodec);
      force_vcodec=-1;
      continue;      
    }
    printf("Can't find codec for video format 0x%X !\n",sh_video->format);
      printf("*** Try to upgrade %s from DOCS/codecs.conf\n",get_path("codecs.conf"));
      printf("*** If it's still not OK, then read DOCS/CODECS!\n");
    #ifdef HAVE_GUI
     if ( !nogui )

       usec_sleep( 10000 );
      }
    #endif
    exit(1);
  }
  if(sh_video->codec->driver==force_vcodec) break;  /* OK, we find our codec */
  if(force_vcodec!=-1&&sh_video->codec->driver!=force_vcodec) continue;
  if(!allow_dshow && sh_video->codec->driver==4) continue; // skip DShow
  break;
}
//has_video=sh_video->codec->driver;