diff options
| author | corey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-02-17 01:57:41 +0000 |
|---|---|---|
| committer | corey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-02-17 01:57:41 +0000 |
| commit | 1ab575101ab9e2e250d782b4e104fcca1c1c66b0 (patch) | |
| tree | 740c93933a4d6c891deccda22ab985c333951981 /libmpdemux/demuxer.h | |
| parent | 808ce9a03a6d2f810ab3616c33105a08b987f07c (diff) | |
| download | mpv-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.h')
| -rw-r--r-- | libmpdemux/demuxer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index bf17d79bb6..9eeff6e067 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -151,7 +151,7 @@ typedef struct demuxers_desc_st { /// Close the demuxer void (*close)(struct demuxer_st *demuxer); ///< Optional // Seek - void (*seek)(struct demuxer_st *demuxer, float rel_seek_secs, int flags); ///< Optional + void (*seek)(struct demuxer_st *demuxer, float rel_seek_secs, float audio_delay, int flags); ///< Optional // Control int (*control)(struct demuxer_st *demuxer, int cmd, void *arg); ///< Optional } demuxer_desc_t; @@ -306,7 +306,7 @@ static inline int avi_stream_id(unsigned int id){ } demuxer_t* demux_open(stream_t *stream,int file_format,int aid,int vid,int sid,char* filename); -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); demuxer_t* new_demuxers_demuxer(demuxer_t* vd, demuxer_t* ad, demuxer_t* sd); // AVI demuxer params: |