# HG changeset patch # User arpi # Date 1004395314 0 # Node ID 3e0204ff3be01e8996ebc9a3de6530e5617c84e5 # Parent 199d36d27171fe8f4c9cbdba00f9bbee1c6fe599 twos pcm audio support diff -r 199d36d27171 -r 3e0204ff3be0 libmpdemux/demux_mov.c --- a/libmpdemux/demux_mov.c Mon Oct 29 22:41:15 2001 +0000 +++ b/libmpdemux/demux_mov.c Mon Oct 29 22:41:54 2001 +0000 @@ -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);