Mercurial > mplayer.hg
comparison libmpdemux/demux_ts.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 | b6b34e21941b |
comparison
equal
deleted
inserted
replaced
| 17635:db13b7295651 | 17636:b849a99cdc3c |
|---|---|
| 3069 | 3069 |
| 3070 extern int videobuf_code_len; | 3070 extern int videobuf_code_len; |
| 3071 extern int sync_video_packet(demux_stream_t *); | 3071 extern int sync_video_packet(demux_stream_t *); |
| 3072 extern int skip_video_packet(demux_stream_t *); | 3072 extern int skip_video_packet(demux_stream_t *); |
| 3073 | 3073 |
| 3074 static void demux_seek_ts(demuxer_t *demuxer, float rel_seek_secs, int flags) | 3074 static void demux_seek_ts(demuxer_t *demuxer, float rel_seek_secs, float audio_delay, int flags) |
| 3075 { | 3075 { |
| 3076 demux_stream_t *d_audio=demuxer->audio; | 3076 demux_stream_t *d_audio=demuxer->audio; |
| 3077 demux_stream_t *d_video=demuxer->video; | 3077 demux_stream_t *d_video=demuxer->video; |
| 3078 demux_stream_t *d_sub=demuxer->sub; | 3078 demux_stream_t *d_sub=demuxer->sub; |
| 3079 sh_audio_t *sh_audio=d_audio->sh; | 3079 sh_audio_t *sh_audio=d_audio->sh; |