diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-10-29 22:41:54 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-10-29 22:41:54 +0000 |
| commit | 9db786f121c9e46f635b7ec79fccea833f79d00f (patch) | |
| tree | 9fa11dac9788a0396af15261088f29ccb6f26d92 /libmpdemux | |
| parent | 2cf2fabfacd9fff74327a65607e277c3c42c84d8 (diff) | |
| download | mpv-9db786f121c9e46f635b7ec79fccea833f79d00f.tar.bz2 mpv-9db786f121c9e46f635b7ec79fccea833f79d00f.tar.xz | |
twos pcm audio support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2550 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_mov.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index 5174bef735..6d980621c8 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -749,9 +749,11 @@ if(trak->samplesize){ 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); |