Merge commit 'bd5ad8b23d0f7d469ca30d03deca879993eb0431'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 21:20:17 +0000 (23:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 21:20:36 +0000 (23:20 +0200)
commit1a41415b2adcc38d1de4b10ed2f97c2db2036c08
tree13588f07ffa9c928d468ed442598809552655471
parent2f8f5027ad6f16969b284b1a22f77302f8fc429e
parentbd5ad8b23d0f7d469ca30d03deca879993eb0431
Merge commit 'bd5ad8b23d0f7d469ca30d03deca879993eb0431'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/hq_hqa.c