Merge commit '4ccccd6c40a6d0ce85e96a6e37f558236e2a6a75'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 1 Jul 2015 17:09:06 +0000 (19:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 1 Jul 2015 17:09:10 +0000 (19:09 +0200)
commit92c858ae667a68cfbc79e5e38a027054ddf69c1b
tree92144c1f197311751882b0890ad72653bbcce139
parent9cf95654ac90214bbec9904f7e96525799172db9
parent4ccccd6c40a6d0ce85e96a6e37f558236e2a6a75
Merge commit '4ccccd6c40a6d0ce85e96a6e37f558236e2a6a75'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/g2meet.c