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)
* commit 'bd5ad8b23d0f7d469ca30d03deca879993eb0431':
  hq_hqa: Fix reading hqa quantization matrix index

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

Simple merge