[FFmpeg-cvslog] Merge commit 'bd5ad8b23d0f7d469ca30d03deca879993eb0431'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 20 23:20:17 2015 +0200| [1a41415b2adcc38d1de4b10ed2f97c2db2036c08] | committer: Michael Niedermayer

Merge commit 'bd5ad8b23d0f7d469ca30d03deca879993eb0431'

* commit 'bd5ad8b23d0f7d469ca30d03deca879993eb0431':
  hq_hqa: Fix reading hqa quantization matrix index

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

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