[Mplayer-cvslog] CVS: 0_90 mencoder.c,1.204,1.205 cfg-mencoder.h,1.65,1.66

[Arpi of Ize]

Update of /cvsroot/mplayer/0_90
In directory mail:/var/tmp.root/cvs-serv31649

Modified Files:
	mencoder.c cfg-mencoder.h 
Log Message:
backport: -ovc nuv


Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/0_90/mencoder.c,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- mencoder.c	24 Jan 2003 01:04:50 -0000	1.204
+++ mencoder.c	10 Mar 2003 16:12:11 -0000	1.205
@@ -8,6 +8,7 @@
 #define VCODEC_LIBDV 8
 #define VCODEC_XVID 9
 #define VCODEC_QTVIDEO 10
+#define VCODEC_NUV 11
 
 #define ACODEC_COPY 0
 #define ACODEC_PCM 1
@@ -671,6 +672,9 @@
         sh_video->vfilter=vf_open_encoder(NULL,"xvid",(char *)mux_v); break;
     case VCODEC_QTVIDEO:
         sh_video->vfilter=vf_open_encoder(NULL,"qtvideo",(char *)mux_v); break;
+    case VCODEC_NUV:        
+        sh_video->vfilter=vf_open_encoder(NULL,"nuv",(char *)mux_v); break;
+
     }
     if(!mux_v->bih || !sh_video->vfilter){
         mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_EncoderOpenFailed);

Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/0_90/cfg-mencoder.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- cfg-mencoder.h	6 Feb 2003 20:24:12 -0000	1.65
+++ cfg-mencoder.h	10 Mar 2003 16:12:11 -0000	1.66
@@ -56,6 +56,8 @@
 extern struct config xvidencopts_conf[];
 #endif
 
+extern struct config nuvopts_conf[];
+
 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},
@@ -68,6 +70,7 @@
 	{"libdv", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_LIBDV, NULL},
 	{"xvid", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_XVID, NULL},
 	{"qtvideo", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_QTVIDEO, NULL},
+	{"nuv", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_NUV, 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"
@@ -207,6 +210,8 @@
 #ifdef HAVE_XVID
 	{"xvidencopts", xvidencopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
 #endif
+
+	{"nuvopts",  nuvopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
 
 #define MAIN_CONF
 #include "cfg-common.h"