Merge commit '6230de03aad9f26d5843afb913d196622e0b5b98' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Mar 2014 11:14:41 +0000 (12:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Mar 2014 11:14:41 +0000 (12:14 +0100)
* commit '6230de03aad9f26d5843afb913d196622e0b5b98':
  vf_frei0r: refactor library loading from env variable

Conflicts:
configure
libavfilter/vf_frei0r.c

Not merged, we use av_strtok() which leads to simpler code

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

Trivial merge