Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Feb 2014 02:31:07 +0000 (03:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Feb 2014 02:31:10 +0000 (03:31 +0100)
* cus/stable:
  lavfi/frei0r: factorize plugin loading with static path
  lavfi/frei0r: search plugins in lib64 dirs on all architectures

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

Trivial merge