Merge commit 'd0449e754553b0c110b6cd75f6725b82144fbd2a'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Jul 2014 17:28:55 +0000 (19:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Jul 2014 17:29:53 +0000 (19:29 +0200)
commit06e5d28e33e9e3b9e38ff958f29bba925e44d573
tree58e5f807fc8a7f0bd9f31e69fbba164a0cac0f40
parentdd2c9034b174a2b17f8e3ed972c49720bab1d4c1
parentd0449e754553b0c110b6cd75f6725b82144fbd2a
Merge commit 'd0449e754553b0c110b6cd75f6725b82144fbd2a'

* commit 'd0449e754553b0c110b6cd75f6725b82144fbd2a':
  vaapi: Update idct_permutation location after dsputil/idctdsp split

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