Mercurial > mplayer.hg
diff mencoder.c @ 17569:6c541a8421ca
Reverse commit of unfinished patch for passing audio_delay to the demuxers.
author | corey |
---|---|
date | Thu, 09 Feb 2006 19:39:51 +0000 |
parents | f580a7755ac5 |
children | 2fd66535616a |
line wrap: on
line diff
--- a/mencoder.c Thu Feb 09 18:17:04 2006 +0000 +++ b/mencoder.c Thu Feb 09 19:39:51 2006 +0000 @@ -1036,12 +1036,12 @@ else sscanf(seek_to_sec, "%f", &d); - demux_seek(demuxer, d, audio_delay, 1); + demux_seek(demuxer, d, 1); // there is 2 way to handle the -ss option in 3-pass mode: // > 1. do the first pass for the whole file, and use -ss for 2nd/3rd pases only // > 2. do all the 3 passes with the same -ss value // this line enables behaviour 1. (and kills 2. at the same time): -// if(demuxer2) demux_seek(demuxer2, d, audio_delay, 1); +// if(demuxer2) demux_seek(demuxer2, d, 1); } if (out_file_format == MUXER_TYPE_MPEG) @@ -1769,7 +1769,7 @@ if (sh_video->pts >= next_edl_record->stop_sec) return 1; // nothing to do... if (!edl_seek_type) { - if(demux_seek(demuxer, next_edl_record->stop_sec - sh_video->pts, audio_delay, 0)){ + if(demux_seek(demuxer, next_edl_record->stop_sec - sh_video->pts, 0)){ sh_video->pts = demuxer->video->pts; //if (vo_vobsub) vobsub_seek(vo_vobsub,sh_video->pts); resync_video_stream(sh_video);