Merge commit '9991298f2c4d9022ad56057f15d037e18d454157'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 13:45:03 +0000 (15:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 13:53:27 +0000 (15:53 +0200)
* commit '9991298f2c4d9022ad56057f15d037e18d454157':
  bink: Bound check the quantization matrix.

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

Trivial merge