Commit 1eb218e4 authored by Timothy B. Terriberry's avatar Timothy B. Terriberry

Rename mergesort as it conflicts with <stdlib.h> on the BSDs.


git-svn-id: https://svn.xiph.org/branches/lowmem-branch/Tremor@17380 0101bb08-14d6-0310-b084-bc0e0c8e3800
parent 7aac44ff
......@@ -53,7 +53,7 @@ static int ilog(unsigned int v){
return(ret);
}
static void mergesort(char *index,ogg_uint16_t *vals,ogg_uint16_t n){
static void vorbis_mergesort(char *index,ogg_uint16_t *vals,ogg_uint16_t n){
ogg_uint16_t i,j;
char *temp,*A=index,*B=_ogg_malloc(n*sizeof(*B));
......@@ -147,7 +147,7 @@ vorbis_info_floor *floor1_info_unpack (vorbis_info *vi,oggpack_buffer *opb){
/* also store a sorted position index */
for(j=0;j<info->posts;j++)info->forward_index[j]=j;
mergesort(info->forward_index,info->postlist,info->posts);
vorbis_mergesort(info->forward_index,info->postlist,info->posts);
/* discover our neighbors for decode where we don't use fit flags
(that would push the neighbors outward) */
......
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