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)
commit669043db811a6dec2236284a40117fdbf1d32ba1
tree80765b5dcf23dac5f67e9ee54d73b5f784fafe9a
parente8e91a32e5ce3f7bc57634597684da8dcb334aec
parentead0dd3cf6e524743a8cedc61223423ac6d6e784
Merge remote-tracking branch 'cus/stable'

* 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>