[FFmpeg-cvslog] Merge commit '4ccccd6c40a6d0ce85e96a6e37f558236e2a6a75'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul  1 19:09:06 2015 +0200| [92c858ae667a68cfbc79e5e38a027054ddf69c1b] | committer: Michael Niedermayer

Merge commit '4ccccd6c40a6d0ce85e96a6e37f558236e2a6a75'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=92c858ae667a68cfbc79e5e38a027054ddf69c1b
---