Merge commit '0b699920f3c0b2e30969b38ce59226653f9d80ec'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 10 Nov 2015 16:43:17 +0000 (17:43 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 10 Nov 2015 16:43:17 +0000 (17:43 +0100)
commit2503aa6bd9125593f7a5c730915685e515f83907
tree35d88d28a563ea84708aed3ac5e2f4c98774e4de
parentd786cdff1ca5e24cff7207118bc6c8a4ed124cef
parent0b699920f3c0b2e30969b38ce59226653f9d80ec
Merge commit '0b699920f3c0b2e30969b38ce59226653f9d80ec'

* commit '0b699920f3c0b2e30969b38ce59226653f9d80ec':
  lagarith: Correctly compute hash_shift

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/lagarithrac.c