Merge remote-tracking branch 'origin/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 5 Jan 2015 14:55:40 +0000 (15:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 5 Jan 2015 14:55:47 +0000 (15:55 +0100)
* origin/master:
  libavfilter/vf_blend: do not unconditionally compile both filters

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

Trivial merge