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 /mencoder.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 'mencoder.c')
| -rw-r--r-- | mencoder.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mencoder.c b/mencoder.c index ca079fe83f..cdf9735767 100644 --- a/mencoder.c +++ b/mencoder.c @@ -94,8 +94,10 @@ static char* spudec_ifo=NULL; static int has_audio=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 int out_audio_codec=-1; int out_video_codec=-1; @@ -633,7 +635,7 @@ default: sh_video->vfilter=append_filters(sh_video->vfilter); 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) mencoder_exit(1,NULL); |