Mercurial > mplayer.hg
comparison libmpdemux/demux_xmms.c @ 17636:b849a99cdc3c
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 | 6ff3379a0862 |
children | f72bc5754209 |
comparison
equal
deleted
inserted
replaced
17635:db13b7295651 | 17636:b849a99cdc3c |
---|---|
295 ds_add_packet(ds,dp); | 295 ds_add_packet(ds,dp); |
296 | 296 |
297 return 1; | 297 return 1; |
298 } | 298 } |
299 | 299 |
300 static void demux_xmms_seek(demuxer_t *demuxer,float rel_seek_secs,int flags){ | 300 static void demux_xmms_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){ |
301 stream_t* s = demuxer->stream; | 301 stream_t* s = demuxer->stream; |
302 sh_audio_t* sh_audio = demuxer->audio->sh; | 302 sh_audio_t* sh_audio = demuxer->audio->sh; |
303 xmms_priv_t *priv=demuxer->priv; | 303 xmms_priv_t *priv=demuxer->priv; |
304 int32_t pos; | 304 int32_t pos; |
305 | 305 |