[Mplayer-cvslog] CVS: main cfg-mencoder.h, 1.78, 1.79 mencoder.c, 1.235, 1.236

[Tobias Diedrich CVS]

CVS change done by Tobias Diedrich CVS

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

Modified Files:
	cfg-mencoder.h mencoder.c 
Log Message:
rawvideo muxer 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.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- cfg-mencoder.h	17 Feb 2004 12:43:06 -0000	1.78
+++ cfg-mencoder.h	9 Mar 2004 14:46:34 -0000	1.79
@@ -151,9 +151,11 @@
 m_option_t of_conf[]={
 	{"avi", &out_file_format, CONF_TYPE_FLAG, 0, 0, MUXER_TYPE_AVI, NULL},
 	{"mpeg", &out_file_format, CONF_TYPE_FLAG, 0, 0, MUXER_TYPE_MPEG, NULL},
+	{"rawvideo", &out_file_format, CONF_TYPE_FLAG, 0, 0, MUXER_TYPE_RAWVIDEO, NULL},
 	{"help", "\nAvailable output formats:\n"
 	"   avi      - Microsoft Audio/Video Interleaved\n"
 	"   mpeg     - MPEG-1 system stream format\n"
+	"   rawvideo - (video only, one stream only) raw stream, no muxing\n"
 	"\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 	{NULL, NULL, 0, 0, 0, 0, NULL}
 };

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -r1.235 -r1.236
--- mencoder.c	18 Feb 2004 13:33:16 -0000	1.235
+++ mencoder.c	9 Mar 2004 14:46:34 -0000	1.236
@@ -527,6 +527,10 @@
     mp_msg(MSGT_MENCODER,MSGL_INFO,"input fps will be interpreted as %5.2f instead\n", sh_video->fps);
   }
 
+  if(sh_audio && out_file_format==MUXER_TYPE_RAWVIDEO){
+      mp_msg(MSGT_MENCODER,MSGL_ERR,"Output file format RAWVIDEO does not support audio - disabling audio\n");
+      sh_audio=NULL;
+  }
   if(sh_audio && out_audio_codec<0){
     if(audio_id==-2)
 	mp_msg(MSGT_MENCODER,MSGL_ERR,"This demuxer doesn't support -nosound yet.\n");