[MPlayer-cvslog] CVS: main mencoder.c,1.314,1.315

[Richard Felker CVS]

CVS change done by Richard Felker CVS

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

Modified Files:
	mencoder.c 
Log Message:
reapply rawaudio muxer fix (don't disable audio without user's permission!) (previously reversed because of mistake in patch.. 10l to me :)

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -r1.314 -r1.315
--- mencoder.c	23 Oct 2005 07:30:56 -0000	1.314
+++ mencoder.c	23 Oct 2005 07:32:35 -0000	1.315
@@ -582,10 +582,6 @@
     mp_msg(MSGT_MENCODER,MSGL_INFO,MSGTR_ForcingInputFPS, sh_video->fps);
   }
 
-  if(sh_audio && out_file_format==MUXER_TYPE_RAWVIDEO){
-      mp_msg(MSGT_MENCODER,MSGL_ERR,MSGTR_RawvideoDoesNotSupportAudio);
-      sh_audio=NULL;
-  }
   if(sh_audio && out_audio_codec<0){
     if(audio_id==-2)
 	mp_msg(MSGT_MENCODER,MSGL_ERR,MSGTR_DemuxerDoesntSupportNosound);