Merge commit '4e5aa080bb8d83cb6de1ffbdd7b37ec34bc6b30b'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Mar 2014 19:42:35 +0000 (20:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Mar 2014 19:42:49 +0000 (20:42 +0100)
commit80e67feda806ffbc51bbbc8de869f9ab5878bcce
tree8c8dacd0c6830a5d99b2a8abe24a13e033bd0ef5
parent3f4e73afe92743e96a633aa5b80416e4714e4783
parent4e5aa080bb8d83cb6de1ffbdd7b37ec34bc6b30b
Merge commit '4e5aa080bb8d83cb6de1ffbdd7b37ec34bc6b30b'

* commit '4e5aa080bb8d83cb6de1ffbdd7b37ec34bc6b30b':
  truehd: break out part of rematrix_channels into platform-specific callback.

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