# HG changeset patch # User rfelker # Date 1130052755 0 # Node ID d8012b9a754b9caecfa0d288d4cff49d40f83af4 # Parent 6cba67a823ec039efeccfd74574d7236ae8807f7 reapply rawaudio muxer fix (don't disable audio without user's permission!) (previously reversed because of mistake in patch.. 10l to me :) diff -r 6cba67a823ec -r d8012b9a754b mencoder.c --- 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);