Mercurial > mplayer.hg

comparison libmpdemux/demux_mpg.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 b742a2c71c25
comparison
equal deleted inserted replaced
17635:db13b7295651 17636:b849a99cdc3c
674 return 1; 674 return 1;
675 } 675 }
676 676
677 extern void skip_audio_frame(sh_audio_t *sh_audio); 677 extern void skip_audio_frame(sh_audio_t *sh_audio);
678 678
679 void demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,int flags){ 679 void demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,float audio_delay, int flags){
680 demux_stream_t *d_audio=demuxer->audio; 680 demux_stream_t *d_audio=demuxer->audio;
681 demux_stream_t *d_video=demuxer->video; 681 demux_stream_t *d_video=demuxer->video;
682 sh_audio_t *sh_audio=d_audio->sh; 682 sh_audio_t *sh_audio=d_audio->sh;
683 sh_video_t *sh_video=d_video->sh; 683 sh_video_t *sh_video=d_video->sh;
684 mpg_demuxer_t *mpg_d=(mpg_demuxer_t*)demuxer->priv; 684 mpg_demuxer_t *mpg_d=(mpg_demuxer_t*)demuxer->priv;