diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-01 19:09:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-01 19:09:10 +0200 |
| commit | 92c858ae667a68cfbc79e5e38a027054ddf69c1b (patch) | |
| tree | 92144c1f197311751882b0890ad72653bbcce139 | |
| parent | 9cf95654ac90214bbec9904f7e96525799172db9 (diff) | |
| parent | 4ccccd6c40a6d0ce85e96a6e37f558236e2a6a75 (diff) | |
| download | ffmpeg-92c858ae667a68cfbc79e5e38a027054ddf69c1b.tar.gz | |
Merge commit '4ccccd6c40a6d0ce85e96a6e37f558236e2a6a75'
* commit '4ccccd6c40a6d0ce85e96a6e37f558236e2a6a75':
g2meet: use an unsigned type for the djb hash
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/g2meet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index 2a7124a378..9cc60502a4 100644 --- a/libavcodec/g2meet.c +++ b/libavcodec/g2meet.c @@ -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); |