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

[Richard Felker CVS]

CVS change done by Richard Felker CVS

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

Modified Files:
	mencoder.c 
Log Message:
reverse patch that was mistakenly applied with unwanted unrelated changes

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -r1.313 -r1.314
--- mencoder.c	20 Oct 2005 05:54:51 -0000	1.313
+++ mencoder.c	23 Oct 2005 07:30:56 -0000	1.314
@@ -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
       }
     }
 }