AVI pts/seek fixes, VBR support, faster NI seek

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1482 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 4 insertions, 2 deletions

diff --git a/mplayer.c b/mplayer.c
index 933a400861..5c87498b84 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -1357,8 +1357,10 @@ if(1)
     if(pts_from_bps){
       // PTS = (audio position)/(bytes per sec)
 //      a_pts=(ds_tell(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
-      a_pts=(ds_tell(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->wf->nAvgBytesPerSec;
-//      delay_corrected=1; // hack
+      if(sh_audio->audio.dwSampleSize)
+        a_pts=(ds_tell(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->wf->nAvgBytesPerSec;
+      else  // VBR:
+        a_pts=d_audio->pack_no*(float)sh_audio->audio.dwScale/(float)sh_audio->audio.dwRate;
       v_pts=d_video->pack_no*(float)sh_video->video.dwScale/(float)sh_video->video.dwRate;
       if(verbose)printf("%5.3f|",v_pts-d_video->pts);
     } else {