diff options
| author | corey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-02-07 20:22:44 +0000 |
|---|---|---|
| committer | corey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-02-07 20:22:44 +0000 |
| commit | 15debd85d2181b75d1e2a1e0e0ffeed4b98f821f (patch) | |
| tree | f7322d7d1585a290d33f0d83194e502a374b3061 /libmpdemux/demuxer.c | |
| parent | 5d1bccd70c0c9fd25c9d60fea303234ce2b609c9 (diff) | |
| download | mpv-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/demuxer.c')
| -rw-r--r-- | libmpdemux/demuxer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 8ff2fc747f..181a16d3a6 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; |