Mercurial > mplayer.hg
comparison libmpdemux/demux_rawdv.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 | 6c541a8421ca |
children | d2d9d011203f |
comparison
equal
deleted
inserted
replaced
17635:db13b7295651 | 17636:b849a99cdc3c |
---|---|
34 off_t current_filepos; | 34 off_t current_filepos; |
35 int frame_number; | 35 int frame_number; |
36 dv_decoder_t *decoder; | 36 dv_decoder_t *decoder; |
37 } rawdv_frames_t; | 37 } rawdv_frames_t; |
38 | 38 |
39 static void demux_seek_rawdv(demuxer_t *demuxer,float rel_seek_secs,int flags) | 39 static void demux_seek_rawdv(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags) |
40 { | 40 { |
41 rawdv_frames_t *frames = (rawdv_frames_t *)demuxer->priv; | 41 rawdv_frames_t *frames = (rawdv_frames_t *)demuxer->priv; |
42 sh_video_t *sh_video = demuxer->video->sh; | 42 sh_video_t *sh_video = demuxer->video->sh; |
43 off_t newpos=(flags&1)?0:frames->current_frame; | 43 off_t newpos=(flags&1)?0:frames->current_frame; |
44 if(flags&2) | 44 if(flags&2) |