Mercurial > mplayer.hg

diff libmpdemux/demux_film.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 ff000b249bd9
line wrap: on
line diff
--- a/libmpdemux/demux_film.c	Thu Feb 16 22:43:42 2006 +0000
+++ b/libmpdemux/demux_film.c	Fri Feb 17 01:57:41 2006 +0000
@@ -46,7 +46,7 @@
   unsigned int film_version;
 } film_data_t;
 
-static void demux_seek_film(demuxer_t *demuxer, float rel_seek_secs, int flags)
+static void demux_seek_film(demuxer_t *demuxer, float rel_seek_secs, float audio_delay, int flags)
 {
   film_data_t *film_data = (film_data_t *)demuxer->priv;
   int new_current_chunk=(flags&1)?0:film_data->current_chunk;