mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
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:
commit
92c858ae66
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user