[FFmpeg-cvslog] Merge commit '40b331e1f41cf118bd1b0807cac801437255636f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Apr 22 23:57:35 2014 +0200| [83412f00e98f2dd4e3b4369a8dbaf2f54a872c5b] | committer: Michael Niedermayer

Merge commit '40b331e1f41cf118bd1b0807cac801437255636f'

* commit '40b331e1f41cf118bd1b0807cac801437255636f':
  fic: Use proper quantization matrix index

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

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