RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-24 12:22:25 +00:00
Code Issues Releases Wiki Activity

reverse patch that was mistakenly applied with unwanted unrelated changes

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16828 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
rfelker 2005-10-23 07:30:56 +00:00
parent bdbf4bb353
commit a6549bd26b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mencoder.c
View File

@ -582,6 +582,10 @@ 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);
@ -1300,8 +1304,6 @@ default:
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 @@ default:
// skipping allowed -> skip it and distriubute timer error:
v_timer_corr-=(float)mux_v->h.dwScale/mux_v->h.dwRate;
}
#endif
}
}
}