always use rounded-up blocksize for .avi files (fixes Firestarter.mpg.avi)

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

1 files changed, 3 insertions, 2 deletions

diff --git a/mplayer.c b/mplayer.c
index 9025918231..66d7192ce6 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -1665,8 +1665,9 @@ if(time_frame>0.001 && !(vo_flags&256)){
 
     if(pts_from_bps){
 	// PTS = sample_no / samplerate
-        unsigned int samples=(sh_audio->audio.dwSampleSize)?
-          ((ds_tell(d_audio)-sh_audio->a_in_buffer_len)/sh_audio->audio.dwSampleSize) :
+        unsigned int samples=
+//	  (sh_audio->audio.dwSampleSize)?
+//          ((ds_tell(d_audio)-sh_audio->a_in_buffer_len)/sh_audio->audio.dwSampleSize) :
           (d_audio->block_no); // <- used for VBR audio
 	samples+=sh_audio->audio.dwStart; // offset
         a_pts=samples*(float)sh_audio->audio.dwScale/(float)sh_audio->audio.dwRate;