RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '4ccccd6c40a6d0ce85e96a6e37f558236e2a6a75' 

* commit '4ccccd6c40a6d0ce85e96a6e37f558236e2a6a75':
  g2meet: use an unsigned type for the djb hash

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-07-01 19:09:06 +02:00
parent 9cf95654ac 4ccccd6c40
commit 92c858ae66
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/g2meet.c
View File

@ -400,7 +400,7 @@ static inline int log2_ceil(uint32_t x)
/* improved djb2 hash from http://www.cse.yorku.ca/~oz/hash.html */
static int djb2_hash(uint32_t key)
{
int h = 5381;
uint32_t h = 5381;
h = (h * 33) ^ ((key >> 24) & 0xFF); // xxx: probably not needed at all
h = (h * 33) ^ ((key >> 16) & 0xFF);