summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demuxer.c
diff options
context:
space:
mode:
authorcorey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-17 01:57:41 +0000
committercorey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-17 01:57:41 +0000
commit1ab575101ab9e2e250d782b4e104fcca1c1c66b0 (patch)
tree740c93933a4d6c891deccda22ab985c333951981 /libmpdemux/demuxer.c
parent808ce9a03a6d2f810ab3616c33105a08b987f07c (diff)
downloadmpv-1ab575101ab9e2e250d782b4e104fcca1c1c66b0.tar.bz2
mpv-1ab575101ab9e2e250d782b4e104fcca1c1c66b0.tar.xz
Second-try commit of this patch.
1. Include audio_delay as an argument to demux_seek. 2. Modify demux_seek_avi to adjust the audio/video stream positions so that mplayer/mencoder will instantly be in sync even when -delay is specified. I've quadruple checked this time; hopefully I haven't missed anything. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17637 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demuxer.c')
-rw-r--r--libmpdemux/demuxer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 8ff2fc747f..b8b0a14ae9 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -859,7 +859,7 @@ demuxer_t* demux_open(stream_t *vs,int file_format,int audio_id,int video_id,int
}
-int demux_seek(demuxer_t *demuxer,float rel_seek_secs,int flags){
+int demux_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){
demux_stream_t *d_audio=demuxer->audio;
demux_stream_t *d_video=demuxer->video;
sh_audio_t *sh_audio=d_audio->sh;
@@ -893,7 +893,7 @@ if(!demuxer->seekable){
#endif
if (demuxer->desc->seek)
- demuxer->desc->seek(demuxer,rel_seek_secs,flags);
+ demuxer->desc->seek(demuxer,rel_seek_secs,audio_delay,flags);
if (sh_audio) resync_audio_stream(sh_audio);