summaryrefslogtreecommitdiffstats
path: root/mencoder.c
diff options
context:
space:
mode:
authorcorey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-09 19:39:51 +0000
committercorey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-09 19:39:51 +0000
commit3f6e7ce5f5eb9d87f01eec90e0361b2b58c53a8b (patch)
treed94b1f77ca0deeb3115fb510ebd09d19fa2f59b0 /mencoder.c
parentc9cf174b9cf43ca1efb0911698e7a17ddb81d96b (diff)
downloadmpv-3f6e7ce5f5eb9d87f01eec90e0361b2b58c53a8b.tar.bz2
mpv-3f6e7ce5f5eb9d87f01eec90e0361b2b58c53a8b.tar.xz
Reverse commit of unfinished patch for passing audio_delay to the demuxers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17570 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
-rw-r--r--mencoder.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mencoder.c b/mencoder.c
index bd27465041..034bf03021 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -1036,12 +1036,12 @@ if (seek_to_sec) {
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 @@ static int edl_seek(edl_record_ptr next_edl_record, demuxer_t* demuxer, demux_st
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);