[FFmpeg-cvslog] Merge remote-tracking branch 'cus/stable'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Feb 28 03:31:07 2014 +0100| [669043db811a6dec2236284a40117fdbf1d32ba1] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=669043db811a6dec2236284a40117fdbf1d32ba1
---