diff options
| author | rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-10-19 05:44:27 +0000 |
|---|---|---|
| committer | rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-10-19 05:44:27 +0000 |
| commit | 389246593568ef0ed92a96f03abd7c26f77979e2 (patch) | |
| tree | f5e939c49c81b0cf7aa8b2581de4e85de48ead7d /mencoder.c | |
| parent | 7cb2c21193bdc53be6df34f7b12838b53469d900 (diff) | |
| download | mpv-389246593568ef0ed92a96f03abd7c26f77979e2.tar.bz2 mpv-389246593568ef0ed92a96f03abd7c26f77979e2.tar.xz | |
processing audio is sometimes essential for a/v sync, so 1000l to
whoever made rawvideo muxer disable audio!!
with this patch, audio is processed but simply thrown away by the
muxer. various 'error' conditions in rawvideo muxer are removed to
make it work. feel free to re-add them if they can be done without
breaking anything, but do not use printf !!!!
btw old behavior can be obtained by manually specifying -nosound.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16806 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mencoder.c b/mencoder.c index 44f5eedcae..7efc1a7344 100644 --- a/mencoder.c +++ b/mencoder.c @@ -580,10 +580,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); @@ -1302,6 +1298,8 @@ 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,6 +1308,7 @@ default: // skipping allowed -> skip it and distriubute timer error: v_timer_corr-=(float)mux_v->h.dwScale/mux_v->h.dwRate; } +#endif } } } |