summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_asf.c
diff options
context:
space:
mode:
authorcorey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-07 20:22:44 +0000
committercorey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-07 20:22:44 +0000
commit15debd85d2181b75d1e2a1e0e0ffeed4b98f821f (patch)
treef7322d7d1585a290d33f0d83194e502a374b3061 /libmpdemux/demux_asf.c
parent5d1bccd70c0c9fd25c9d60fea303234ce2b609c9 (diff)
downloadmpv-15debd85d2181b75d1e2a1e0e0ffeed4b98f821f.tar.bz2
mpv-15debd85d2181b75d1e2a1e0e0ffeed4b98f821f.tar.xz
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. Other demuxers could be modified similarly in the future. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17554 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_asf.c')
-rw-r--r--libmpdemux/demux_asf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c
index a072b1c640..dd8d1a90e6 100644
--- a/libmpdemux/demux_asf.c
+++ b/libmpdemux/demux_asf.c
@@ -369,7 +369,7 @@ static int demux_asf_fill_buffer(demuxer_t *demux, demux_stream_t *ds){
extern void skip_audio_frame(sh_audio_t *sh_audio);
-static void demux_seek_asf(demuxer_t *demuxer,float rel_seek_secs,int flags){
+static void demux_seek_asf(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;