[Mplayer-cvslog] CVS: main/libmpdemux demux_mov.c,1.22,1.23

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mplayer:/var/tmp.root/cvs-serv15293

Modified Files:
	demux_mov.c 
Log Message:
twos pcm audio support

Index: demux_mov.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mov.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- demux_mov.c	29 Oct 2001 22:40:25 -0000	1.22
+++ demux_mov.c	29 Oct 2001 22:41:54 -0000	1.23
@@ -749,9 +749,11 @@
 	x*=(trak->stdata[38]<<8)+trak->stdata[39];  // bytes/frame
     } else {
 	// works for ima4:   -- we should find this info in mov headers!
-	x/=ds->ss_div; x*=ds->ss_mul; // compression ratio fix  ! HACK !
-	// x*=(trak->stdata[18]<<8)+trak->stdata[19];x/=8;  // bits/sample
-	
+	if(ds->ss_div!=1 || ds->ss_mul!=1){
+	    x/=ds->ss_div; x*=ds->ss_mul; // compression ratio fix  ! HACK !
+	} else {
+	    x*=(trak->stdata[18]<<8)+trak->stdata[19];x/=8;  // bits/sample
+	}
     }
     ds_read_packet(ds,demuxer->stream,x,pts,trak->chunks[trak->pos].pos,0);
     if(ds==demuxer->audio) mp_msg(MSGT_DEMUX, MSGL_DBG2, "sample %d bytes pts %5.3f\n",trak->chunks[trak->pos].size*trak->samplesize,pts);