Merge commit '35818b8aaf4d669ed0bbb05c3fd06e619f2db01a'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 23:07:35 +0000 (01:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 23:07:57 +0000 (01:07 +0200)
commitcdf6804056098757cc74ebce17752fb34771f06d
tree86be45184a2c6684c5343fc48147c44ce70aab13
parent9e1cdfb89be553b8d21239a7eeaa0d1bc0cbbf5a
parent35818b8aaf4d669ed0bbb05c3fd06e619f2db01a
Merge commit '35818b8aaf4d669ed0bbb05c3fd06e619f2db01a'

* commit '35818b8aaf4d669ed0bbb05c3fd06e619f2db01a':
  dxva2_hevc: fix 32x32 scaling lists

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