diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | misc.h | 20 | ||||
| -rw-r--r-- | vorbisfile.c | 6 |
3 files changed, 4 insertions, 24 deletions
diff --git a/Makefile.am b/Makefile.am index d0a6c16..9041c4f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = -I./ lib_LTLIBRARIES = libvorbisidec.la -libvorbisidec_la_SOURCES = mdct.c block.c window.c misc.c\ +libvorbisidec_la_SOURCES = mdct.c block.c window.c \ synthesis.c info.c \ floor1.c floor0.c vorbisfile.c \ res012.c mapping0.c registry.c codebook.c \ @@ -20,26 +20,6 @@ #include "ivorbiscodec.h" #include "os_types.h" -//#define _VDBG_GRAPHFILE "_0.m" -extern void *_VDBG_malloc(void *ptr,long bytes,char *file,long line); -extern void _VDBG_free(void *ptr,char *file,long line); - -#undef _ogg_malloc -#undef _ogg_calloc -#undef _ogg_realloc -#undef _ogg_free - -#define _ogg_malloc(x) _VDBG_malloc(NULL,(x),__FILE__,__LINE__) -#define _ogg_calloc(x,y) _VDBG_malloc(NULL,(x)*(y),__FILE__,__LINE__) -#define _ogg_realloc(x,y) _VDBG_malloc((x),(y),__FILE__,__LINE__) -#define _ogg_free(x) _VDBG_free((x),__FILE__,__LINE__) - - -extern void *_vorbis_block_alloc(vorbis_block *vb,long bytes); -extern void _vorbis_block_ripcord(vorbis_block *vb); -extern void _analysis_output(char *base,int i,ogg_int32_t *v,int point, - int n,int bark,int dB); - #include "asm_arm.h" #ifndef _V_WIDE_MATH 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){ |