Merge branch 'master' into epoxy

[movit] / README

diff --git a/README b/README
index 81bb4c99e2f8428cca5b417c6fd7801c17a57103..0537f687e9b0b07fb340ae554970849ef44fe0eb 100644 (file)
--- a/README
+++ b/README
@@ -40,10 +40,11 @@ for performance estimates.
 Still TL;DR, please give me the list of filters
 ===============================================
 
-Blur, diffusion, glow, lift/gamma/gain (color correction), mirror,
-mix (add two inputs), overlay (the Porter-Duff “over” operation),
-scale (bilinear and Lanczos), sharpen (both by unsharp mask and by
-Wiener filters), saturation (or desaturation), vignette, and white balance.
+Blur, diffusion, FFT-based convolution, glow, lift/gamma/gain (color
+correction), mirror, mix (add two inputs), luma mix (use a map to wipe between
+two inputs), overlay (the Porter-Duff “over” operation), scale (bilinear and
+Lanczos), sharpen (both by unsharp mask and by Wiener filters), saturation
+(or desaturation), vignette, and white balance.
 
 Yes, that's a short list. But they all look great, are fast and don't give
 you any nasty surprises. (I'd love to include denoise, deinterlace and