Merge commit '581c7f0e12b1fa39f73d683e54d6ecda0772c5a9'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Dec 2014 23:38:52 +0000 (00:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Dec 2014 23:39:00 +0000 (00:39 +0100)
* commit '581c7f0e12b1fa39f73d683e54d6ecda0772c5a9':
  arm: make ff_mlp_filter_channel_arm and ff_mlp_rematrix_channel_arm position independent

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/arm/mlpdsp_armv5te.S

Simple merge