Merge commit '483321fe789566dcb27b6387c00ea16dd86bc587'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Mar 2014 19:50:17 +0000 (20:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Mar 2014 19:50:43 +0000 (20:50 +0100)
commit44dc373d4a7ef484387fa3646b4e7513d5595bd5
tree3fd7b75f0732898889a48f9b3d3d2d1577c208f9
parent89135716fd4c2963e01e0155547c47bf709f1aa3
parent483321fe789566dcb27b6387c00ea16dd86bc587
Merge commit '483321fe789566dcb27b6387c00ea16dd86bc587'

* commit '483321fe789566dcb27b6387c00ea16dd86bc587':
  truehd: add hand-scheduled ARM asm version of ff_mlp_rematrix_channel.

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