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)
commit0e1c827e842c0a86eb32de853162d97e214e2b23
treeee95c80b2ba25b45a0ed8184bcb9620a2ce5e721
parentc9151de7c42553bb145be608df8513c1287f1f24
parent91bdb244009c7d33d547bf7901ef1ae4538a51df
Merge remote-tracking branch 'origin/master'

* origin/master:
  libavfilter/vf_blend: do not unconditionally compile both filters

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