[Mplayer-cvslog] CVS: main mplayer.c,1.592,1.593

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv8480

Modified Files:
	mplayer.c 
Log Message:
always use rounded-up blocksize for .avi files (fixes Firestarter.mpg.avi)


Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.592
retrieving revision 1.593
diff -u -r1.592 -r1.593
--- mplayer.c	13 Oct 2002 21:58:53 -0000	1.592
+++ mplayer.c	14 Oct 2002 01:39:17 -0000	1.593
@@ -1665,8 +1665,9 @@
 
     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;