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/demux_fli.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/demux_fli.c')
| -rw-r--r-- | libmpdemux/demux_fli.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/demux_fli.c b/libmpdemux/demux_fli.c index 2b23835c52..6750a256b4 100644 --- a/libmpdemux/demux_fli.c +++ b/libmpdemux/demux_fli.c @@ -22,7 +22,7 @@ typedef struct _fli_frames_t { unsigned int *frame_size; } fli_frames_t; -static void demux_seek_fli(demuxer_t *demuxer,float rel_seek_secs,int flags){ +static void demux_seek_fli(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){ fli_frames_t *frames = (fli_frames_t *)demuxer->priv; sh_video_t *sh_video = demuxer->video->sh; int newpos=(flags&1)?0:frames->current_frame; |