Mercurial > mplayer.hg

changeset 16827:6cba67a823ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
reverse patch that was mistakenly applied with unwanted unrelated changes
author rfelker
date Sun, 23 Oct 2005 07:30:56 +0000
parents a4d1b7dc44e0
children d8012b9a754b
files mencoder.c
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mencoder.c	Sat Oct 22 19:28:37 2005 +0000
+++ b/mencoder.c	Sun Oct 23 07:30:56 2005 +0000
@@ -582,6 +582,10 @@
     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);
@@ -1300,8 +1304,6 @@
       badframes++;
       if(skip_flag<=0){
 	// unwanted skipping of a frame, what to do?
-        v_timer_corr-=(float)mux_v->h.dwScale/mux_v->h.dwRate;
-#if 0
 	if(skip_limit==0){
 	    // skipping not allowed -> write empty frame:
 	    if (!encode_duplicates || !sh_video->vfilter || ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, VFCTRL_DUPLICATE_FRAME, 0) != CONTROL_TRUE)
@@ -1310,7 +1312,6 @@
 	    // skipping allowed -> skip it and distriubute timer error:
 	    v_timer_corr-=(float)mux_v->h.dwScale/mux_v->h.dwRate;
 	}
-#endif
       }
     }
 }