diff options
| author | corey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-02-09 19:39:51 +0000 |
|---|---|---|
| committer | corey <corey@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-02-09 19:39:51 +0000 |
| commit | 3f6e7ce5f5eb9d87f01eec90e0361b2b58c53a8b (patch) | |
| tree | d94b1f77ca0deeb3115fb510ebd09d19fa2f59b0 /libmpdemux/demux_avi.c | |
| parent | c9cf174b9cf43ca1efb0911698e7a17ddb81d96b (diff) | |
| download | mpv-3f6e7ce5f5eb9d87f01eec90e0361b2b58c53a8b.tar.bz2 mpv-3f6e7ce5f5eb9d87f01eec90e0361b2b58c53a8b.tar.xz | |
Reverse commit of unfinished patch for passing audio_delay to the demuxers.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17570 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_avi.c')
| -rw-r--r-- | libmpdemux/demux_avi.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c index 21ab48dc6c..6febdd160c 100644 --- a/libmpdemux/demux_avi.c +++ b/libmpdemux/demux_avi.c @@ -618,7 +618,7 @@ static demuxer_t* demux_open_avi(demuxer_t* demuxer){ //extern float initial_pts_delay; -void demux_seek_avi(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){ +void demux_seek_avi(demuxer_t *demuxer,float rel_seek_secs,int flags){ avi_priv_t *priv=demuxer->priv; demux_stream_t *d_audio=demuxer->audio; demux_stream_t *d_video=demuxer->video; @@ -706,8 +706,8 @@ void demux_seek_avi(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int curr_audio_pos/=align; curr_audio_pos*=align; #else - /* immediate seeking to audio position, including when streams are delayed */ - curr_audio_pos=(priv->avi_video_pts + audio_delay)*(float)sh_audio->audio.dwRate/(float)sh_audio->audio.dwScale; + curr_audio_pos=(priv->avi_video_pts)*(float)sh_audio->audio.dwRate/(float)sh_audio->audio.dwScale; + curr_audio_pos-=sh_audio->audio.dwStart; curr_audio_pos*=sh_audio->audio.dwSampleSize; #endif @@ -733,8 +733,7 @@ void demux_seek_avi(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int } else { // VBR audio - /* immediate seeking to audio position, including when streams are delayed */ - int chunks=(priv->avi_video_pts + audio_delay)*(float)sh_audio->audio.dwRate/(float)sh_audio->audio.dwScale; + int chunks=(priv->avi_video_pts)*(float)sh_audio->audio.dwRate/(float)sh_audio->audio.dwScale; audio_chunk_pos=0; // find audio chunk pos: |