comparison libmpdemux/demux_asf.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 4b8193d51bda
children 3fe3b2b3a6ce
comparison
equal deleted inserted replaced
17635:db13b7295651 17636:b849a99cdc3c
367 367
368 #include "stheader.h" 368 #include "stheader.h"
369 369
370 extern void skip_audio_frame(sh_audio_t *sh_audio); 370 extern void skip_audio_frame(sh_audio_t *sh_audio);
371 371
372 static void demux_seek_asf(demuxer_t *demuxer,float rel_seek_secs,int flags){ 372 static void demux_seek_asf(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){
373 demux_stream_t *d_audio=demuxer->audio; 373 demux_stream_t *d_audio=demuxer->audio;
374 demux_stream_t *d_video=demuxer->video; 374 demux_stream_t *d_video=demuxer->video;
375 sh_audio_t *sh_audio=d_audio->sh; 375 sh_audio_t *sh_audio=d_audio->sh;
376 // sh_video_t *sh_video=d_video->sh; 376 // sh_video_t *sh_video=d_video->sh;
377 377