Merge commit '40b331e1f41cf118bd1b0807cac801437255636f'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Apr 2014 21:57:35 +0000 (23:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Apr 2014 21:58:21 +0000 (23:58 +0200)
* commit '40b331e1f41cf118bd1b0807cac801437255636f':
  fic: Use proper quantization matrix index

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

Trivial merge