From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 9 Dec 2014 23:38:52 +0000 (+0100)
Subject: Merge commit '581c7f0e12b1fa39f73d683e54d6ecda0772c5a9'
X-Git-Tag: android-x86-6.0-r1~1504
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=824932dc473255745218c84033a4bc57ebe48576;p=android-x86%2Fexternal-ffmpeg.git

Merge commit '581c7f0e12b1fa39f73d683e54d6ecda0772c5a9'

* commit '581c7f0e12b1fa39f73d683e54d6ecda0772c5a9':
  arm: make ff_mlp_filter_channel_arm and ff_mlp_rematrix_channel_arm position independent

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

824932dc473255745218c84033a4bc57ebe48576