Mercurial > mplayer.hg
changeset 7457:c65cb0d256c3
Support for XviD encoding
| author | kmkaplan |
|---|---|
| date | Sat, 21 Sep 2002 12:41:29 +0000 |
| parents | dacc262f41ba |
| children | e5dacf3e6a04 |
| files | cfg-mencoder.h mencoder.c |
| diffstat | 2 files changed, 14 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/cfg-mencoder.h Sat Sep 21 12:34:02 2002 +0000 +++ b/cfg-mencoder.h Sat Sep 21 12:41:29 2002 +0000 @@ -45,6 +45,10 @@ extern struct config vfwopts_conf[]; #endif +#ifdef HAVE_XVID +extern struct config xvidencopts_conf[]; +#endif + struct config ovc_conf[]={ {"copy", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_COPY, NULL}, {"frameno", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_FRAMENO, NULL}, @@ -55,6 +59,7 @@ {"rawrgb", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_RAWRGB, NULL}, {"vfw", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_VFW, NULL}, {"libdv", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_LIBDV, NULL}, + {"xvid", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_XVID, NULL}, {"help", "\nAvailable codecs:\n" " copy - frame copy, without re-encoding. doesn't work with filters!\n" " frameno - special audio-only file for 3-pass encoding, see DOCS!\n" @@ -71,6 +76,9 @@ #ifdef HAVE_LIBDV095 " libdv - DV encoding using libdv v0.9.5\n" #endif +#ifdef HAVE_XVID + " xvid\n" +#endif "\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, {NULL, NULL, 0, 0, 0, 0, NULL} }; @@ -165,6 +173,9 @@ #ifdef USE_WIN32DLL {"vfwopts", vfwopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, #endif +#ifdef HAVE_XVID + {"xvidencopts", xvidencopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, +#endif #define MAIN_CONF #include "cfg-common.h"
--- a/mencoder.c Sat Sep 21 12:34:02 2002 +0000 +++ b/mencoder.c Sat Sep 21 12:41:29 2002 +0000 @@ -6,6 +6,7 @@ #define VCODEC_RAWRGB 6 #define VCODEC_VFW 7 #define VCODEC_LIBDV 8 +#define VCODEC_XVID 9 #define ACODEC_COPY 0 #define ACODEC_PCM 1 @@ -644,6 +645,8 @@ sh_video->vfilter=vf_open_encoder(NULL,"vfw",(char *)mux_v); break; case VCODEC_LIBDV: sh_video->vfilter=vf_open_encoder(NULL,"libdv",(char *)mux_v); break; + case VCODEC_XVID: + sh_video->vfilter=vf_open_encoder(NULL,"xvid",(char *)mux_v); break; } if(!mux_v->bih || !sh_video->vfilter){ mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_EncoderOpenFailed);