Mercurial > mplayer.hg

diff libmpdemux/demux_fli.c @ 17636:b849a99cdc3c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author corey
date Fri, 17 Feb 2006 01:57:41 +0000
parents 6c541a8421ca
children 1a2aaf037d48
line wrap: on
line diff
--- a/libmpdemux/demux_fli.c	Thu Feb 16 22:43:42 2006 +0000
+++ b/libmpdemux/demux_fli.c	Fri Feb 17 01:57:41 2006 +0000
@@ -22,7 +22,7 @@
   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;