diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-09-26 01:31:18 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-09-26 01:31:18 +0000 |
| commit | 50de15356ad928c225b9666449ed968908e96c28 (patch) | |
| tree | 6f3fa7416a0ee193757d6d050c5d93c15caa2ee2 /mplayer.c | |
| parent | e8cc8584f11c70dbbfe9c28211aa763964167576 (diff) | |
| download | mpv-50de15356ad928c225b9666449ed968908e96c28.tar.bz2 mpv-50de15356ad928c225b9666449ed968908e96c28.tar.xz | |
-vc/-vfm accepts codec/driver _list_ now. empty list element for -vc means
*, ie search all codecs. codec name starting with - disables the codec.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7507 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
| -rw-r--r-- | mplayer.c | 16 |
1 files changed, 13 insertions, 3 deletions
@@ -177,8 +177,10 @@ int has_audio=1; int has_video=1; char *audio_codec=NULL; // override audio codec char *video_codec=NULL; // override video codec +char **video_codec_list=NULL; // override video codec char *audio_fm=NULL; // override audio codec family char *video_fm=NULL; // override video codec family +char **video_fm_list=NULL; // override video codec family // streaming: int audio_id=-1; @@ -619,19 +621,27 @@ if(!parse_codec_cfg(get_path("codecs.conf"))){ } } +#if 0 + if(video_codec_list){ + int i; + video_codec=video_codec_list[0]; + for(i=0;video_codec_list[i];i++) + printf("vc#%d: '%s'\n",i,video_codec_list[i]); + } +#endif if(audio_codec && strcmp(audio_codec,"help")==0){ mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableAudioCodecs); list_codecs(1); printf("\n"); exit(0); } - if(video_codec && strcmp(video_codec,"help")==0){ + if(video_codec_list && strcmp(video_codec_list[0],"help")==0){ mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_AvailableVideoCodecs); list_codecs(0); printf("\n"); exit(0); } - if(video_fm && strcmp(video_fm,"help")==0){ + if(video_fm_list && strcmp(video_fm_list[0],"help")==0){ vfm_help(); printf("\n"); exit(0); @@ -1234,7 +1244,7 @@ sh_video->vfilter=append_filters(sh_video->vfilter); current_module="init_video_codec"; mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n"); -init_best_video_codec(sh_video,video_codec,video_fm); +init_best_video_codec(sh_video,video_codec_list,video_fm_list); mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n"); if(!sh_video->inited){ |