Mercurial > mplayer.hg

changeset 16828:d8012b9a754b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
reapply rawaudio muxer fix (don't disable audio without user's permission!) (previously reversed because of mistake in patch.. 10l to me :)
author rfelker
date Sun, 23 Oct 2005 07:32:35 +0000
parents 6cba67a823ec
children c1aabebbe2e7
files mencoder.c
diffstat 1 files changed, 0 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mencoder.c	Sun Oct 23 07:30:56 2005 +0000
+++ b/mencoder.c	Sun Oct 23 07:32:35 2005 +0000
@@ -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);