diff options
| author | rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-10-23 07:32:35 +0000 |
|---|---|---|
| committer | rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-10-23 07:32:35 +0000 |
| commit | 98c0ee2923ec35fdee3d3b743ede6c4baa2aed8c (patch) | |
| tree | b6cc091a5cb9d76d3044fc0b174f02eeffa75191 /mencoder.c | |
| parent | a6549bd26bdeb50d33e351e67b4716ee6b8c78b2 (diff) | |
| download | mpv-98c0ee2923ec35fdee3d3b743ede6c4baa2aed8c.tar.bz2 mpv-98c0ee2923ec35fdee3d3b743ede6c4baa2aed8c.tar.xz | |
reapply rawaudio muxer fix (don't disable audio without user's permission!) (previously reversed because of mistake in patch.. 10l to me :)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16829 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/mencoder.c b/mencoder.c index c31f63da3b..924f38890f 100644 --- a/mencoder.c +++ b/mencoder.c @@ -582,10 +582,6 @@ sh_video=d_video->sh; 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); |