sean-m
/
stb
mirror of https://github.com/nothings/stb.git
1
0
Fork 0
Code Issues Releases Activity

Merge branch 'avoid-name-clash' of https://github.com/jlnr/stb into working

pull/415/merge
Sean Barrett 2017-03-03 06:51:37 -08:00
parent f9a83c0ae1 a055654ee3
commit c88489549d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
stb_vorbis.c
View File

@ -1271,12 +1271,12 @@ static void neighbors(uint16 *x, int n, int *plow, int *phigh)
typedef struct typedef struct
{ {
uint16 x,y; uint16 x,y;
} Point; } stbv__point;
static int STBV_CDECL point_compare(const void *p, const void *q) static int STBV_CDECL point_compare(const void *p, const void *q)
{ {
Point *a = (Point *) p; stbv__point *a = (stbv__point *) p;
Point *b = (Point *) q; stbv__point *b = (stbv__point *) q;
return a->x < b->x ? -1 : a->x > b->x; return a->x < b->x ? -1 : a->x > b->x;
} }
@ -3874,7 +3874,7 @@ static int start_decoder(vorb *f)
g->book_list[j] = get_bits(f,8); g->book_list[j] = get_bits(f,8);
return error(f, VORBIS_feature_not_supported); return error(f, VORBIS_feature_not_supported);
} else { } else {
Point p[31*8+2]; stbv__point p[31*8+2];
Floor1 *g = &f->floor_config[i].floor1; Floor1 *g = &f->floor_config[i].floor1;
int max_class = -1; int max_class = -1;
g->partitions = get_bits(f, 5); g->partitions = get_bits(f, 5);