[Mplayer-cvslog] CVS: main cfg-mencoder.h,1.50,1.51 mencoder.c,1.160,1.161

[Kim Minh Kaplan CVS]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv18368

Modified Files:
	cfg-mencoder.h mencoder.c 
Log Message:
Support for XviD encoding


Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- cfg-mencoder.h	29 Aug 2002 20:50:48 -0000	1.50
+++ cfg-mencoder.h	21 Sep 2002 12:41:29 -0000	1.51
@@ -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}
 };
@@ -164,6 +172,9 @@
 #endif
 #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

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- mencoder.c	20 Sep 2002 18:54:22 -0000	1.160
+++ mencoder.c	21 Sep 2002 12:41:29 -0000	1.161
@@ -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);