[Mplayer-cvslog] CVS: main cfg-mencoder.h, 1.77, 1.78 mencoder.c, 1.233, 1.234

[Attila Kinali CVS]

CVS change done by Attila Kinali CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv14505

Modified Files:
	cfg-mencoder.h mencoder.c 
Log Message:
remove raw nonsense and replace it by one ovc
patch by John Earl <jwe21 at cam.ac.uk>


Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- cfg-mencoder.h	5 Feb 2004 17:08:55 -0000	1.77
+++ cfg-mencoder.h	17 Feb 2004 12:43:06 -0000	1.78
@@ -67,8 +67,7 @@
 //	{"raw", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_RAW, NULL},
 	{"lavc", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_LIBAVCODEC, NULL},
 //	{"null", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_NULL, NULL},
-	{"rawrgb", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_RAWRGB, NULL},
-	{"rawyuv", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_RAWYUV, NULL},
+	{"raw", &out_video_codec, CONF_TYPE_FLAG, 0, 0, VCODEC_RAW, 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},
@@ -77,8 +76,7 @@
 	{"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"
-	"   rawrgb   - uncompressed RGB 24bpp video\n"
-	"   rawyuv   - uncompressed 4:2:0 YUV (I420) 12bpp video\n"
+	"   raw      - uncompressed video. Use fourcc option to set format explicitly.\n"
 	"   nuv      - nuppel video\n"
 #ifdef HAVE_DIVX4ENCORE
 #ifdef ENCORE_XVID

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- mencoder.c	10 Feb 2004 14:12:26 -0000	1.233
+++ mencoder.c	17 Feb 2004 12:43:06 -0000	1.234
@@ -3,13 +3,12 @@
 // real codecs:
 #define VCODEC_DIVX4 2
 #define VCODEC_LIBAVCODEC 4
-#define VCODEC_RAWRGB 6
 #define VCODEC_VFW 7
 #define VCODEC_LIBDV 8
 #define VCODEC_XVID 9
 #define VCODEC_QTVIDEO 10
 #define VCODEC_NUV 11
-#define VCODEC_RAWYUV 12
+#define VCODEC_RAW 12
 
 #define ACODEC_COPY 0
 #define ACODEC_PCM 1
@@ -681,10 +680,8 @@
 	sh_video->vfilter=vf_open_encoder(NULL,"divx4",(char *)mux_v); break;
     case VCODEC_LIBAVCODEC:
         sh_video->vfilter=vf_open_encoder(NULL,"lavc",(char *)mux_v); break;
-    case VCODEC_RAWRGB:
-        sh_video->vfilter=vf_open_encoder(NULL,"rawrgb",(char *)mux_v); break;
-    case VCODEC_RAWYUV:
-        sh_video->vfilter=vf_open_encoder(NULL,"rawyuv",(char *)mux_v); break;
+    case VCODEC_RAW:
+        sh_video->vfilter=vf_open_encoder(NULL,"raw",(char *)mux_v); break;
     case VCODEC_VFW:
         sh_video->vfilter=vf_open_encoder(NULL,"vfw",(char *)mux_v); break;
     case VCODEC_LIBDV: