diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-12-22 14:32:08 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-12-22 14:32:08 +0000 |
| commit | cd940231ca0765220149a888a86bf732d60bbef3 (patch) | |
| tree | 3c1cb54fe0a490f913eb1824f8eefb2b6446b048 /cfg-mencoder.h | |
| parent | c4cfa0d808a4847918a02bdbd9324e4f7ed89e4c (diff) | |
| download | mpv-cd940231ca0765220149a888a86bf732d60bbef3.tar.bz2 mpv-cd940231ca0765220149a888a86bf732d60bbef3.tar.xz | |
added libavcodec support (mjpeg,h263,rv10,mpeg1 codecs tested&working) and added -ffourcc option (force fourcc in ouput)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3658 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'cfg-mencoder.h')
| -rw-r--r-- | cfg-mencoder.h | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/cfg-mencoder.h b/cfg-mencoder.h index 87939b0a6a..36130e72db 100644 --- a/cfg-mencoder.h +++ b/cfg-mencoder.h @@ -43,12 +43,29 @@ struct config lameopts_conf[]={ }; #endif +#ifdef USE_LIBAVCODEC +struct config lavcopts_conf[]={ + {"vcodec", &lavc_param_vcodec, CONF_TYPE_STRING, 0, 0, 0}, + {"vbitrate", &lavc_param_vbitrate, CONF_TYPE_INT, CONF_RANGE, 4, 24000000}, + {"vhq", &lavc_param_vhq, CONF_TYPE_FLAG, 0, 0, 1}, + {"keyint", &lavc_param_keyint, CONF_TYPE_INT, 0, 0, 0}, + {NULL, NULL, 0, 0, 0, 0} +}; +#endif + +#ifdef USE_WIN32DLL +struct config vfwopts_conf[]={ + {NULL, NULL, 0, 0, 0, 0} +}; +#endif + struct config ovc_conf[]={ {"copy", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_COPY}, {"frameno", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_FRAMENO}, {"divx4", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_DIVX4}, {"raw", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_RAW}, - {"help", "\nAvailable codecs:\n copy\n frameno\n divx4\n raw\n\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, + {"lavc", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_LIBAVCODEC}, + {"help", "\nAvailable codecs:\n copy\n frameno\n divx4\n raw\n lavc\n\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0}, {NULL, NULL, 0, 0, 0, 0} }; @@ -83,6 +100,8 @@ struct config conf[]={ {"oac", oac_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0}, {"ovc", ovc_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0}, + {"ffourcc", &force_fourcc, CONF_TYPE_STRING, 0, 4, 4}, + {"pass", &pass, CONF_TYPE_INT, CONF_RANGE,0,2}, {"passlogfile", &passtmpfile, CONF_TYPE_STRING, 0, 0, 0}, @@ -90,6 +109,12 @@ struct config conf[]={ #ifdef HAVE_MP3LAME {"lameopts", lameopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0}, #endif +#ifdef USE_LIBAVCODEC + {"lavcopts", lavcopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0}, +#endif +#ifdef USE_WIN32DLL + {"vfwopts", vfwopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0}, +#endif #define MAIN_CONF #include "cfg-common.h" |