Merges in Monkey's fixes PR with a resolution for a conflict

This commit is contained in:
Areloch 2015-09-03 22:58:57 -05:00
commit bedc79aacb
22 changed files with 131 additions and 74 deletions

View file

@ -450,7 +450,7 @@ long vorbis_book_decodev_set(codebook *book,float *a,oggpack_buffer *b,int n){
}
}
}else{
int i,j;
int i;
for(i=0;i<n;){
a[i++]=0.f;