diff options
| author | Monty <xiphmont@xiph.org> | 2003-03-30 23:40:56 +0000 |
|---|---|---|
| committer | Monty <xiphmont@xiph.org> | 2003-03-30 23:40:56 +0000 |
| commit | a4c6794f438526b35bb43741a39a8049699a53db (patch) | |
| tree | 2b2dcd419aea502c6be26f571ed8735654ac1eed /vorbisfile.c | |
| parent | 3c764af8013b5b153d3e97311d56a8741536f4cf (diff) | |
| download | tremor-a4c6794f438526b35bb43741a39a8049699a53db.tar.gz | |
Fix several minor bits of merge weirdness spotted by slothead.
git-svn-id: https://svn.xiph.org/trunk/Tremor@4570 0101bb08-14d6-0310-b084-bc0e0c8e3800
Diffstat (limited to 'vorbisfile.c')
| -rw-r--r-- | vorbisfile.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vorbisfile.c b/vorbisfile.c index 14df0ed..41239d3 100644 --- a/vorbisfile.c +++ b/vorbisfile.c @@ -12,7 +12,7 @@ ******************************************************************** function: stdio-based convenience library for opening/seeking/decoding - last mod: $Id: vorbisfile.c,v 1.5 2003/03/29 03:07:21 xiphmont Exp $ + last mod: $Id: vorbisfile.c,v 1.6 2003/03/30 23:40:56 xiphmont Exp $ ********************************************************************/ @@ -936,7 +936,7 @@ ogg_int64_t ov_time_total(OggVorbis_File *vf,int i){ acc+=ov_time_total(vf,i); return(acc); }else{ - return(((ogg_int64_t)vf->pcmlengths[i])*1000/vf->vi[i].rate); + return(((ogg_int64_t)vf->pcmlengths[i*2+1])*1000/vf->vi[i].rate); } } @@ -1446,7 +1446,7 @@ ogg_int64_t ov_pcm_tell(OggVorbis_File *vf){ ogg_int64_t ov_time_tell(OggVorbis_File *vf){ int link=0; ogg_int64_t pcm_total=0; - ogg_int64_t time_total=0.f; + ogg_int64_t time_total=0; if(vf->ready_state<OPENED)return(OV_EINVAL); if(vf->seekable){ |