Commit 521f4d21 authored by Ralph Giles's avatar Ralph Giles

Fix a number of warnings, issue #622.


git-svn-id: https://svn.xiph.org/trunk/Tremor@10707 0101bb08-14d6-0310-b084-bc0e0c8e3800
parent 11396c02
/********************************************************************
* *
* THIS FILE IS PART OF THE OggVorbis 'TREMOR' CODEC SOURCE CODE. *
* *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
* GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2006 *
* BY THE Xiph.Org FOUNDATION http://www.xiph.org/ *
* *
********************************************************************
function: shared block functions
********************************************************************/
#ifndef _V_BLOCK_
#define _V_BLOCK_
extern void _vorbis_block_ripcord(vorbis_block *vb);
extern void *_vorbis_block_alloc(vorbis_block *vb,long bytes);
#endif
/********************************************************************
* *
* THIS FILE IS PART OF THE OggVorbis 'TREMOR' CODEC SOURCE CODE. *
* *
* USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
* GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
* THE OggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2002 *
* BY THE Xiph.Org FOUNDATION http://www.xiph.org/ *
* *
********************************************************************
function: block functions
********************************************************************/
#ifndef _V_BLOCK_
#define _V_BLOCK_
extern void _vorbis_block_ripcord(vorbis_block *vb);
extern void *_vorbis_block_alloc(vorbis_block *vb,long bytes);
#endif
......@@ -24,6 +24,7 @@
#include "registry.h"
#include "codebook.h"
#include "misc.h"
#include "block.h"
#define LSP_FRACBITS 14
......@@ -342,7 +343,6 @@ static vorbis_info_floor *floor0_unpack (vorbis_info *vi,oggpack_buffer *opb){
static vorbis_look_floor *floor0_look (vorbis_dsp_state *vd,vorbis_info_mode *mi,
vorbis_info_floor *i){
int j;
ogg_int32_t scale;
vorbis_info *vi=vd->vi;
codec_setup_info *ci=(codec_setup_info *)vi->codec_setup;
vorbis_info_floor0 *info=(vorbis_info_floor0 *)i;
......
......@@ -24,6 +24,7 @@
#include "registry.h"
#include "codebook.h"
#include "misc.h"
#include "block.h"
#define floor1_rangedB 140 /* floor 1 fixed at -140dB to 0dB range */
......
......@@ -33,6 +33,7 @@
********************************************************************/
#include "ivorbiscodec.h"
#include "codebook.h"
#include "misc.h"
#include "mdct.h"
#include "mdct_lookup.h"
......
......@@ -21,6 +21,7 @@
#include "os.h"
#include "asm_arm.h"
#include <stdlib.h> /* for abs() */
#ifndef _V_WIDE_MATH
#define _V_WIDE_MATH
......@@ -182,6 +183,8 @@ static inline ogg_int32_t VFLOAT_MULT(ogg_int32_t a,ogg_int32_t ap,
return 0;
}
int _ilog(unsigned int);
static inline ogg_int32_t VFLOAT_MULTI(ogg_int32_t a,ogg_int32_t ap,
ogg_int32_t i,
ogg_int32_t *p){
......
......@@ -25,6 +25,7 @@
#include "codebook.h"
#include "misc.h"
#include "os.h"
#include "block.h"
typedef struct {
vorbis_info_residue0 *info;
......
......@@ -22,6 +22,7 @@
#include "codec_internal.h"
#include "registry.h"
#include "misc.h"
#include "block.h"
int vorbis_synthesis(vorbis_block *vb,ogg_packet *op,int decodep){
vorbis_dsp_state *vd=vb->vd;
......
......@@ -61,7 +61,7 @@
static long _get_data(OggVorbis_File *vf){
errno=0;
if(vf->datasource){
char *buffer=ogg_sync_bufferin(vf->oy,CHUNKSIZE);
unsigned char *buffer=ogg_sync_bufferin(vf->oy,CHUNKSIZE);
long bytes=(vf->callbacks.read_func)(buffer,1,CHUNKSIZE,vf->datasource);
if(bytes>0)ogg_sync_wrote(vf->oy,bytes);
if(bytes==0 && errno)return(-1);
......@@ -678,7 +678,7 @@ static int _ov_open1(void *f,OggVorbis_File *vf,char *initial,
previously read data (as we may be reading from a non-seekable
stream) */
if(initial){
char *buffer=ogg_sync_bufferin(vf->oy,ibytes);
unsigned char *buffer=ogg_sync_bufferin(vf->oy,ibytes);
memcpy(buffer,initial,ibytes);
ogg_sync_wrote(vf->oy,ibytes);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment