Mercurial > mplayer.hg

comparison libmpdemux/demux_fli.c @ 17553:67c30d47ffd4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author corey
date Tue, 07 Feb 2006 20:22:44 +0000
parents 6b86089c2edd
children 6c541a8421ca
comparison
equal deleted inserted replaced
17552:3469899beb42 17553:67c30d47ffd4
20 int current_frame; 20 int current_frame;
21 off_t *filepos; 21 off_t *filepos;
22 unsigned int *frame_size; 22 unsigned int *frame_size;
23 } fli_frames_t; 23 } fli_frames_t;
24 24
25 static void demux_seek_fli(demuxer_t *demuxer,float rel_seek_secs,int flags){ 25 static void demux_seek_fli(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){
26 fli_frames_t *frames = (fli_frames_t *)demuxer->priv; 26 fli_frames_t *frames = (fli_frames_t *)demuxer->priv;
27 sh_video_t *sh_video = demuxer->video->sh; 27 sh_video_t *sh_video = demuxer->video->sh;
28 int newpos=(flags&1)?0:frames->current_frame; 28 int newpos=(flags&1)?0:frames->current_frame;
29 if(flags&2){ 29 if(flags&2){
30 // float 0..1 30 // float 0..1